Merge remote-tracking branch 'origin/master'

muharihar · Aug 1, 2020 · f92a95b · f92a95b
2 parents 64f44fb + 23b0518
commit f92a95b
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.0.12
+* Fixed duration called on null
+* Added new control events
+
 ## 0.0.11
 * Fixed iOS crash on dispose
 * Added player headers support

diff --git a/README.md b/README.md
@@ -19,8 +19,8 @@ This plugin is based on [Chewie](https://github.com/brianegan/chewie). Chewie is
 ✔️ Refactored player controls  
 ✔️ Playlist support  
 ✔️ Video in ListView support  
-✔️ Subtitles support (HTML tags support)
-✔️ Headers support
+✔️ Subtitles support (HTML tags support)  
+✔️ Headers support  
 
 
 ## Install

diff --git a/lib/src/configuration/better_player_event_type.dart b/lib/src/configuration/better_player_event_type.dart
@@ -9,4 +9,6 @@ enum BetterPlayerEventType {
   PROGRESS,
   FINISHED,
   EXCEPTION,
+  CONTROLS_VISIBLE,
+  CONTROLS_HIDDEN,
 }
diff --git a/lib/src/controls/better_player_material_controls.dart b/lib/src/controls/better_player_material_controls.dart
@@ -422,7 +422,11 @@ class _BetterPlayerMaterialControlsState
   }
 
   void _onPlayPause() {
-    bool isFinished = _latestValue.position >= _latestValue.duration;
+    bool isFinished = false;
+
+    if (_latestValue?.position != null && _latestValue?.duration != null) {
+      isFinished = _latestValue.position >= _latestValue.duration;
+    }
 
     setState(() {
       if (_controller.value.isPlaying) {
@@ -491,6 +495,7 @@ class _BetterPlayerMaterialControlsState
   }
 
   void _onPlayerHide() {
+    _betterPlayerController.toggleControlsVisibility(!_hideStuff);
     widget.onControlsVisibilityChanged(!_hideStuff);
   }
 

diff --git a/lib/src/core/better_player_controller.dart b/lib/src/core/better_player_controller.dart
@@ -210,6 +210,12 @@ class BetterPlayerController extends ChangeNotifier {
     return videoPlayerController.value.isBuffering;
   }
 
+  void toggleControlsVisibility(bool isVisible) {
+    _postEvent(isVisible
+        ? BetterPlayerEvent(BetterPlayerEventType.CONTROLS_VISIBLE)
+        : BetterPlayerEvent(BetterPlayerEventType.CONTROLS_HIDDEN));
+  }
+
   void _postEvent(BetterPlayerEvent betterPlayerEvent) {
     for (Function eventListener in _eventListeners) {
       if (eventListener != null) {