Unverified Commit 341260fe authored by Daniel Dudek's avatar Daniel Dudek Committed by GitHub
Browse files

Merge branch 'master' into fix/android_volume_focus_change

parents 13cdac86 30c30ec5

CHANGELOG.md

+2 −0
Changes for CHANGELOG.md: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ 
* Add fullscreenOrientation option for iOS [#1215](https://github.com/react-native-community/react-native-video/pull/1215)

* Update to ExoPlayer 2.9.0 [#1285](https://github.com/react-native-community/react-native-video/pull/1285)

* Switch useTextureView to default to `true` [#1286](https://github.com/react-native-community/react-native-video/pull/1286)

* Re-add fullscreenAutorotate prop [#1303](https://github.com/react-native-community/react-native-video/pull/1303)

* Make seek throw a useful error for NaN values [#1283](https://github.com/react-native-community/react-native-video/pull/1283)

* Fix: volume should not change on onAudioFocusChange event [#1327](https://github.com/react-native-community/react-native-video/pull/1327)



### Version 3.2.0

README.md

+6 −0
Changes for README.md: 6 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -260,6 +260,7 @@ var styles = StyleSheet.create({ 
* [bufferConfig](#bufferconfig)

* [controls](#controls)

* [fullscreen](#fullscreen)

* [fullscreenAutorotate](#fullscreenautorotate)

* [fullscreenOrientation](#fullscreenorientation)

* [headers](#headers)

* [id](#id)
@@ -358,6 +359,11 @@ Controls whether the player enters fullscreen on play. 


Platforms: iOS



#### fullscreenAutorotate

If a preferred [fullscreenOrientation](#fullscreenorientation) is set, causes the video to rotate to that orientation but permits rotation of the screen to orientation held by user. Defaults to TRUE.



Platforms: iOS



#### fullscreenOrientation



* **all (default)** -

Video.js

+3 −0
Changes for Video.js: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -51,6 +51,8 @@ export default class Video extends Component { 
  }



  seek = (time, tolerance = 100) => {

    if (isNaN(time)) throw new Error('Specified time is not a number');

    

    if (Platform.OS === 'ios') {

      this.setNativeProps({

        seek: {
@@ -354,6 +356,7 @@ Video.propTypes = { 
  controls: PropTypes.bool,

  audioOnly: PropTypes.bool,

  currentTime: PropTypes.number,

  fullscreenAutorotate: PropTypes.bool,

  fullscreenOrientation: PropTypes.oneOf(['all','landscape','portrait']),

  progressUpdateInterval: PropTypes.number,

  useTextureView: PropTypes.bool,

ios/Video/RCTVideo.m

+10 −0
Changes for ios/Video/RCTVideo.m: 10 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ static int const RCTVideoUnset = -1; 
  NSString * _ignoreSilentSwitch;

  NSString * _resizeMode;

  BOOL _fullscreen;

  BOOL _fullscreenAutorotate;

  NSString * _fullscreenOrientation;

  BOOL _fullscreenPlayerPresented;

  UIViewController * _presentingViewController;
@@ -83,6 +84,7 @@ static int const RCTVideoUnset = -1; 
    _rate = 1.0;

    _volume = 1.0;

    _resizeMode = @"AVLayerVideoGravityResizeAspectFill";

    _fullscreenAutorotate = YES;

    _fullscreenOrientation = @"all";

    _pendingSeek = false;

    _pendingSeekTime = 0.0f;
@@ -1136,6 +1138,7 @@ static int const RCTVideoUnset = -1; 
      [viewController presentViewController:_playerViewController animated:true completion:^{

        _playerViewController.showsPlaybackControls = YES;

        _fullscreenPlayerPresented = fullscreen;

        _playerViewController.autorotate = _fullscreenAutorotate;

        if(self.onVideoFullscreenPlayerDidPresent) {

          self.onVideoFullscreenPlayerDidPresent(@{@"target": self.reactTag});

        }
@@ -1151,6 +1154,13 @@ static int const RCTVideoUnset = -1; 
  }

}



- (void)setFullscreenAutorotate:(BOOL)autorotate {

  _fullscreenAutorotate = autorotate;

  if (_fullscreenPlayerPresented) {

    _playerViewController.autorotate = autorotate;

  }

}



- (void)setFullscreenOrientation:(NSString *)orientation {

  _fullscreenOrientation = orientation;

  if (_fullscreenPlayerPresented) {

ios/Video/RCTVideoManager.m

+1 −0
Changes for ios/Video/RCTVideoManager.m: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ RCT_EXPORT_VIEW_PROPERTY(rate, float); 
RCT_EXPORT_VIEW_PROPERTY(seek, NSDictionary);

RCT_EXPORT_VIEW_PROPERTY(currentTime, float);

RCT_EXPORT_VIEW_PROPERTY(fullscreen, BOOL);

RCT_EXPORT_VIEW_PROPERTY(fullscreenAutorotate, BOOL);

RCT_EXPORT_VIEW_PROPERTY(fullscreenOrientation, NSString);

RCT_EXPORT_VIEW_PROPERTY(progressUpdateInterval, float);

/* Should support: onLoadStart, onLoad, and onError to stay consistent with Image */