Merge branch 'master' into feat/make_controls_testable_in_sample

CHANGELOG.md

@@ -1,9 +1,14 @@
 ## Changelog
 
-### Version 6.0.0-alpha.2
+### Version 6.0.0-alpha.4
 
 - Sample: Add react-native-video controls support [#2852](https://github.com/react-native-video/react-native-video/pull/2852)
 - Add full screen button in default android controls [#2763](https://github.com/react-native-video/react-native-video/pull/2763)
+
+### Version 6.0.0-alpha.3
+- fix ios build [#2854](https://gthub.com/react-native-video/react-native-video/pull/2854)
+
+### Version 6.0.0-alpha.2
 - Upgrade ExoPlayer to 2.18.1 [#2846](https://github.com/react-native-video/react-native-video/pull/2846)
 - Feature add new APIs to query supported features of device decoder (widevine level & codec capabilities) on android [#2740](https://github.com/react-native-video/react-native-video/pull/2740)
 - Feature add support of subtitle styling on android [#2759](https://github.com/react-native-video/react-native-video/pull/2759)

android/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java

@@ -1796,22 +1796,22 @@ class ReactExoplayerView extends FrameLayout implements
                         | SYSTEM_UI_FLAG_FULLSCREEN;
             }
             eventEmitter.fullscreenWillPresent();
+            if (controls) {
+                fullScreenPlayerView.show();
+            }
             post(() -> {
                 decorView.setSystemUiVisibility(uiOptions);
-                if (controls) {
-                    fullScreenPlayerView.show();
-                }
                 eventEmitter.fullscreenDidPresent();
             });
         } else {
             uiOptions = View.SYSTEM_UI_FLAG_VISIBLE;
             eventEmitter.fullscreenWillDismiss();
+            if (controls) {
+                fullScreenPlayerView.dismiss();
+                reLayout(exoPlayerView);
+            }
             post(() -> {
                 decorView.setSystemUiVisibility(uiOptions);
-                if (controls) {
-                    fullScreenPlayerView.dismiss();
-                    reLayout(exoPlayerView);
-                }
                 eventEmitter.fullscreenDidDismiss();
             });
         }

ios/Video/RCTVideo.swift

@@ -21,7 +21,7 @@ class RCTVideo: UIView, RCTVideoPlayerViewControllerDelegate, RCTPlayerObserverH
     private var _localSourceEncryptionKeyScheme:String?
     
     /* Required to publish events */
-    private var _eventDispatcher:RCTEventDispatcherProtocol?
+    private var _eventDispatcher:RCTEventDispatcher?
     private var _videoLoadStarted:Bool = false
     
     private var _pendingSeek:Bool = false
@@ -95,7 +95,7 @@ class RCTVideo: UIView, RCTVideoPlayerViewControllerDelegate, RCTPlayerObserverH
     @objc var onRestoreUserInterfaceForPictureInPictureStop: RCTDirectEventBlock?
     @objc var onGetLicense: RCTDirectEventBlock?
     
-    init(eventDispatcher:RCTEventDispatcherProtocol!) {
+    init(eventDispatcher:RCTEventDispatcher!) {
         super.init(frame: CGRect(x: 0, y: 0, width: 100, height: 100))
         
         _eventDispatcher = eventDispatcher

package.json

@@ -1,6 +1,6 @@
 {
     "name": "react-native-video",
-    "version": "6.0.0-alpha.1",
+    "version": "6.0.0-alpha.3",
     "description": "A <Video /> element for react-native",
     "main": "Video.js",
     "license": "MIT",