Commit 3aa46875 authored by Brent Vatne's avatar Brent Vatne
Browse files

Merge pull request #86 from browniefed/fixAbsolutePositioning

Bump Example in master to use .10-rc, also fix example to actually go full screen.
parents dc6de436 b499d9e0
Loading
Loading
Loading
Loading
+30 −0
Changes for Examples/VideoPlayer/VideoPlayer.xcodeproj/project.pbxproj: 30 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@
		00C302E81ABCBA2D00DB3ED1 /* libRCTImage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302C01ABCB91800DB3ED1 /* libRCTImage.a */; };
		00C302E91ABCBA2D00DB3ED1 /* libRCTNetwork.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302DC1ABCB9D200DB3ED1 /* libRCTNetwork.a */; };
		00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302E41ABCB9EE00DB3ED1 /* libRCTVibration.a */; };
		11149E491B8C36EF009C350B /* libRCTWebSocket.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 11149E471B8C36E7009C350B /* libRCTWebSocket.a */; };
		13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; };
		13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB11A68108700A75B9A /* LaunchScreen.xib */; };
		13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
@@ -68,6 +69,13 @@
			remoteGlobalIDString = 832C81801AAF6DEF007FA2F7;
			remoteInfo = RCTVibration;
		};
		11149E461B8C36E7009C350B /* PBXContainerItemProxy */ = {
			isa = PBXContainerItemProxy;
			containerPortal = 11149E3A1B8C36E7009C350B /* RCTWebSocket.xcodeproj */;
			proxyType = 2;
			remoteGlobalIDString = 3C86DF461ADF2C930047B81A;
			remoteInfo = RCTWebSocket;
		};
		146834031AC3E56700842450 /* PBXContainerItemProxy */ = {
			isa = PBXContainerItemProxy;
			containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
@@ -100,6 +108,7 @@
		00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTImage.xcodeproj; path = "node_modules/react-native/Libraries/Image/RCTImage.xcodeproj"; sourceTree = "<group>"; };
		00C302D31ABCB9D200DB3ED1 /* RCTNetwork.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTNetwork.xcodeproj; path = "node_modules/react-native/Libraries/Network/RCTNetwork.xcodeproj"; sourceTree = "<group>"; };
		00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTVibration.xcodeproj; path = "node_modules/react-native/Libraries/Vibration/RCTVibration.xcodeproj"; sourceTree = "<group>"; };
		11149E3A1B8C36E7009C350B /* RCTWebSocket.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTWebSocket.xcodeproj; path = "node_modules/react-native/Libraries/WebSocket/RCTWebSocket.xcodeproj"; sourceTree = "<group>"; };
		13B07F961A680F5B00A75B9A /* VideoPlayer.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = VideoPlayer.app; sourceTree = BUILT_PRODUCTS_DIR; };
		13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = iOS/AppDelegate.h; sourceTree = "<group>"; };
		13B07FB01A68108700A75B9A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = iOS/AppDelegate.m; sourceTree = "<group>"; };
@@ -118,6 +127,7 @@
			isa = PBXFrameworksBuildPhase;
			buildActionMask = 2147483647;
			files = (
				11149E491B8C36EF009C350B /* libRCTWebSocket.a in Frameworks */,
				00481BEA1AC0C89D00671115 /* libicucore.dylib in Frameworks */,
				146834051AC3E58100842450 /* libReact.a in Frameworks */,
				00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */,
@@ -182,6 +192,14 @@
			name = Products;
			sourceTree = "<group>";
		};
		11149E3B1B8C36E7009C350B /* Products */ = {
			isa = PBXGroup;
			children = (
				11149E471B8C36E7009C350B /* libRCTWebSocket.a */,
			);
			name = Products;
			sourceTree = "<group>";
		};
		13B07FAE1A68108700A75B9A /* VideoPlayer */ = {
			isa = PBXGroup;
			children = (
@@ -208,6 +226,7 @@
		832341AE1AAA6A7D00B99B32 /* Libraries */ = {
			isa = PBXGroup;
			children = (
				11149E3A1B8C36E7009C350B /* RCTWebSocket.xcodeproj */,
				BB1123771B0100FB0015C442 /* RCTVideo.xcodeproj */,
				146833FF1AC3E56700842450 /* React.xcodeproj */,
				832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */,
@@ -330,6 +349,10 @@
					ProductGroup = BB1123781B0100FB0015C442 /* Products */;
					ProjectRef = BB1123771B0100FB0015C442 /* RCTVideo.xcodeproj */;
				},
				{
					ProductGroup = 11149E3B1B8C36E7009C350B /* Products */;
					ProjectRef = 11149E3A1B8C36E7009C350B /* RCTWebSocket.xcodeproj */;
				},
				{
					ProductGroup = 146834001AC3E56700842450 /* Products */;
					ProjectRef = 146833FF1AC3E56700842450 /* React.xcodeproj */;
@@ -385,6 +408,13 @@
			remoteRef = 00C302E31ABCB9EE00DB3ED1 /* PBXContainerItemProxy */;
			sourceTree = BUILT_PRODUCTS_DIR;
		};
		11149E471B8C36E7009C350B /* libRCTWebSocket.a */ = {
			isa = PBXReferenceProxy;
			fileType = archive.ar;
			path = libRCTWebSocket.a;
			remoteRef = 11149E461B8C36E7009C350B /* PBXContainerItemProxy */;
			sourceTree = BUILT_PRODUCTS_DIR;
		};
		146834041AC3E56700842450 /* libReact.a */ = {
			isa = PBXReferenceProxy;
			fileType = archive.ar;
+3 −3
Changes for Examples/VideoPlayer/index.ios.js: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -86,9 +86,9 @@ var VideoPlayer = React.createClass({

    return (
      <View style={styles.container}>
        <TouchableOpacity onPress={() => {this.setState({paused: !this.state.paused})}}>
        <TouchableOpacity style={styles.fullScreen} onPress={() => {this.setState({paused: !this.state.paused})}}>
          <Video source={{uri: "broadchurch"}}
                 style={styles.video}
                 style={styles.fullScreen}
                 rate={this.state.rate}
                 paused={this.state.paused}
                 volume={this.state.volume}
@@ -143,7 +143,7 @@ var styles = StyleSheet.create({
    alignItems: 'center',
    backgroundColor: 'black',
  },
  video: {
  fullScreen: {
    position: 'absolute',
    top: 0,
    left: 0,
+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.8.0",
    "react-native-video": "0.5.0"
    "react-native": "^0.10.0-rc",
    "react-native-video": "^0.6.0"
  }
}