railbird/react-native-video
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into feat/make_controls_testable_in_sample

Browse Source
This commit is contained in:
Olivier Bouillet 2022-09-14 22:40:44 +02:00 committed by GitHub
commit bc814c6fa9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG.md
View File

@ -1,9 +1,14 @@
## Changelog ## 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) - 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) - 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) - 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 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) - Feature add support of subtitle styling on android [#2759](https://github.com/react-native-video/react-native-video/pull/2759)

14
android/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
View File

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

4
ios/Video/RCTVideo.swift
View File

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

2
package.json
View File

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