From b499d9e0b39b12717d53f41b3d44f83848f5347e Mon Sep 17 00:00:00 2001 From: Jason Brown Date: Mon, 24 Aug 2015 23:03:55 -0700 Subject: [PATCH] Absolute positioning of all 0s was with TouchableOpacity using Animated.View, need to also specify that the Animate.View is full screen as well. Upgraded to .10rc and .60, also added RCTWebSocket to the Xcode project since it wasn't there. --- .../VideoPlayer.xcodeproj/project.pbxproj | 30 +++++++++++++++++++ Examples/VideoPlayer/index.ios.js | 6 ++-- Examples/VideoPlayer/package.json | 4 +-- 3 files changed, 35 insertions(+), 5 deletions(-) diff --git a/Examples/VideoPlayer/VideoPlayer.xcodeproj/project.pbxproj b/Examples/VideoPlayer/VideoPlayer.xcodeproj/project.pbxproj index 08cbb29f..2a8de0fc 100644 --- a/Examples/VideoPlayer/VideoPlayer.xcodeproj/project.pbxproj +++ b/Examples/VideoPlayer/VideoPlayer.xcodeproj/project.pbxproj @@ -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 = ""; }; 00C302D31ABCB9D200DB3ED1 /* RCTNetwork.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTNetwork.xcodeproj; path = "node_modules/react-native/Libraries/Network/RCTNetwork.xcodeproj"; sourceTree = ""; }; 00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTVibration.xcodeproj; path = "node_modules/react-native/Libraries/Vibration/RCTVibration.xcodeproj"; sourceTree = ""; }; + 11149E3A1B8C36E7009C350B /* RCTWebSocket.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTWebSocket.xcodeproj; path = "node_modules/react-native/Libraries/WebSocket/RCTWebSocket.xcodeproj"; sourceTree = ""; }; 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 = ""; }; 13B07FB01A68108700A75B9A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = iOS/AppDelegate.m; sourceTree = ""; }; @@ -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 = ""; }; + 11149E3B1B8C36E7009C350B /* Products */ = { + isa = PBXGroup; + children = ( + 11149E471B8C36E7009C350B /* libRCTWebSocket.a */, + ); + name = Products; + sourceTree = ""; + }; 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; diff --git a/Examples/VideoPlayer/index.ios.js b/Examples/VideoPlayer/index.ios.js index 22ab82f3..662c676e 100644 --- a/Examples/VideoPlayer/index.ios.js +++ b/Examples/VideoPlayer/index.ios.js @@ -86,9 +86,9 @@ var VideoPlayer = React.createClass({ return ( - {this.setState({paused: !this.state.paused})}}> + {this.setState({paused: !this.state.paused})}}>