Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -388,4 +388,3 @@ Initial version of Chewie, the video player with a heart of gold.
* Includes Material Player Controls
* Includes Cupertino Player Controls
* Spike version: Focus on good looking UI. Internal code is sloppy, needs a refactor and tests

49 changes: 40 additions & 9 deletions lib/src/chewie_player.dart
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ class Chewie extends StatefulWidget {

class ChewieState extends State<Chewie> {
bool _isFullScreen = false;
bool _wasPlayingBeforeFullScreen = false;
bool _resumeAppliedInFullScreen = false;

bool get isControllerFullScreen => widget.controller.isFullScreen;
late PlayerNotifier notifier;
Expand Down Expand Up @@ -70,6 +72,9 @@ class ChewieState extends State<Chewie> {

Future<void> listener() async {
if (isControllerFullScreen && !_isFullScreen) {
_wasPlayingBeforeFullScreen =
widget.controller.videoPlayerController.value.isPlaying;
_resumeAppliedInFullScreen = false;
_isFullScreen = isControllerFullScreen;
await _pushFullScreenWidget(context);
} else if (_isFullScreen) {
Expand Down Expand Up @@ -133,6 +138,22 @@ class ChewieState extends State<Chewie> {
builder: (context, w) => const PlayerWithControls(),
),
);

if (kIsWeb && !_resumeAppliedInFullScreen) {
_resumeAppliedInFullScreen = true;
WidgetsBinding.instance.addPostFrameCallback((_) async {
if (!mounted) return;
final vpc = widget.controller.videoPlayerController;
await vpc.pause();
await Future<void>.delayed(const Duration(milliseconds: 10));
if (_wasPlayingBeforeFullScreen) {
await vpc.play();
} else {
await vpc.play();
await vpc.pause();
}
});
}

if (widget.controller.routePageBuilder == null) {
return _defaultRoutePageBuilder(
Expand Down Expand Up @@ -166,8 +187,11 @@ class ChewieState extends State<Chewie> {
rootNavigator: widget.controller.useRootNavigator,
).push(route);

final wasPlaying =
widget.controller.videoPlayerController.value.isPlaying;

if (kIsWeb) {
_reInitializeControllers();
await _reInitializeControllers(wasPlaying);
}

_isFullScreen = false;
Expand Down Expand Up @@ -235,16 +259,23 @@ class ChewieState extends State<Chewie> {
}
}

///When viewing full screen on web, returning from full screen causes original video to lose the picture.
///We re initialise controllers for web only when returning from full screen
void _reInitializeControllers() {
/// When viewing full screen on web, returning from full screen could cause
/// the original video element to lose the picture. We re-initialize the
/// controllers for web only when returning from full screen and preserve
/// the previous play/pause state.
Future<void> _reInitializeControllers(bool wasPlaying) async {
final prevPosition = widget.controller.videoPlayerController.value.position;
widget.controller.videoPlayerController.initialize().then((_) async {
widget.controller._initialize();
widget.controller.videoPlayerController.seekTo(prevPosition);

await widget.controller.videoPlayerController.initialize();
widget.controller._initialize();
await widget.controller.videoPlayerController.seekTo(prevPosition);

if (wasPlaying) {
await widget.controller.videoPlayerController.play();
widget.controller.videoPlayerController.pause();
});
} else {
await widget.controller.videoPlayerController.play();
await widget.controller.videoPlayerController.pause();
}
}
}

Expand Down
Loading