Commit db402be6 authored by Brent Vatne's avatar Brent Vatne
Browse files

Fix imports and bump sample project to 0.8.0

parent e832d386

.gitignore

+1 −0
Changes for .gitignore: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -5,3 +5,4 @@ Examples/VideoPlayer/node_modules/**/* 
Examples/VideoPlayer/VideoPlayer.xcodeproj/project.xcworkspace/**/*

Examples/VideoPlayer/VideoPlayer.xcodeproj/xcuserdata/**/*

npm-debug.log

.DS_Store

Examples/VideoPlayer/node_modules/react-native-video/RCTVideo.xcodeproj/project.pbxproj

+4 −4
Changes for Examples/VideoPlayer/node_modules/react-native-video/RCTVideo.xcodeproj/project.pbxproj: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -25,10 +25,10 @@ 


/* Begin PBXFileReference section */

		134814201AA4EA6300B7C361 /* libRCTVideo.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRCTVideo.a; sourceTree = BUILT_PRODUCTS_DIR; };

		BBD49E391AC8DEF000610F8E /* RCTVideo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ../../../../RCTVideo.h; sourceTree = "<group>"; };

		BBD49E3A1AC8DEF000610F8E /* RCTVideo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ../../../../RCTVideo.m; sourceTree = "<group>"; };

		BBD49E3B1AC8DEF000610F8E /* RCTVideoManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ../../../../RCTVideoManager.h; sourceTree = "<group>"; };

		BBD49E3C1AC8DEF000610F8E /* RCTVideoManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ../../../../RCTVideoManager.m; sourceTree = "<group>"; };

		BBD49E391AC8DEF000610F8E /* RCTVideo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTVideo.h; sourceTree = "<group>"; };

		BBD49E3A1AC8DEF000610F8E /* RCTVideo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTVideo.m; sourceTree = "<group>"; };

		BBD49E3B1AC8DEF000610F8E /* RCTVideoManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTVideoManager.h; sourceTree = "<group>"; };

		BBD49E3C1AC8DEF000610F8E /* RCTVideoManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTVideoManager.m; sourceTree = "<group>"; };

/* End PBXFileReference section */



/* Begin PBXFrameworksBuildPhase section */

Examples/VideoPlayer/package.json

+2 −2
Changes for Examples/VideoPlayer/package.json: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
    "start": "node_modules/react-native/packager/packager.sh"

  },

  "dependencies": {

    "react-native": "^0.4.4",

    "react-native-video": "^0.4.1"

    "react-native": "0.8.0",

    "react-native-video": "0.5.0"

  }

}

Video.android.js

+1 −3
Changes for Video.android.js: 1 added line, 3 removed lines.
Original line number Diff line number Diff line 
'use strict';



var warning = require('warning');



var Video = {

  test: function() {

    warning("Not yet implemented for Android.");

    console.warn("Not yet implemented for Android.");

  }

};

Video.ios.js

+8 −18
Changes for Video.ios.js: 8 added lines, 18 removed lines.
Original line number Diff line number Diff line 
var React = require('react-native');

var { requireNativeComponent, } = React;

var ReactNativeViewAttributes = require('ReactNativeViewAttributes');

var NativeModules = require('NativeModules');

var StyleSheet = require('StyleSheet');

var PropTypes = require('ReactPropTypes');

var StyleSheetPropType = require('StyleSheetPropType');

var { StyleSheet, requireNativeComponent, PropTypes, NativeModules, } = React;



var VideoResizeMode = require('./VideoResizeMode');

var VideoStylePropTypes = require('./VideoStylePropTypes');

var NativeMethodsMixin = require('NativeMethodsMixin');

var flattenStyle = require('flattenStyle');

var merge = require('merge');

var deepDiffer = require('deepDiffer');



var VIDEO_REF = 'video';



var Video = React.createClass({

  propTypes: {
@@ -19,7 +13,6 @@ var Video = React.createClass({ 
    seek: PropTypes.number,



    /* Wrapper component */

    style: StyleSheetPropType(VideoStylePropTypes),

    source: PropTypes.object,

    resizeMode: PropTypes.string,

    repeat: PropTypes.bool,
@@ -34,11 +27,8 @@ var Video = React.createClass({ 
    onEnd: PropTypes.func,

  },



  mixins: [NativeMethodsMixin],



  viewConfig: {

    uiViewClassName: 'UIView',

    validAttributes: ReactNativeViewAttributes.UIView

  setNativeProps(props) {

    this.refs[VIDEO_REF].setNativeProps(props);

  },



  _onLoadStart(event) {
@@ -70,7 +60,7 @@ var Video = React.createClass({ 
  },



  render() {

    var style = flattenStyle([styles.base, this.props.style]);

    var style = [styles.base, this.props.style];

    var source = this.props.source;

    var uri = source.uri;

    if (uri && uri.match(/^\//)) {
@@ -104,7 +94,7 @@ var Video = React.createClass({ 
      onVideoEnd: this._onEnd,

    });



    return <RCTVideo {... nativeProps} />;

    return <RCTVideo ref={VIDEO_REF} {... nativeProps} />;

  },

});