From b853d2f148d53ab8e46effb48f8798483117e260 Mon Sep 17 00:00:00 2001
From: Brent Vatne <brent.vatne@madriska.com>
Date: Sun, 29 Mar 2015 18:33:45 -0700
Subject: [PATCH 1/3] Basic <Video> tag implementation

---
 Libraries/Video/RCTVideo.h                    |  11 +
 Libraries/Video/RCTVideo.m                    |  72 +++++
 .../Video/RCTVideo.xcodeproj/project.pbxproj  | 264 ++++++++++++++++++
 Libraries/Video/RCTVideoManager.h             |   5 +
 Libraries/Video/RCTVideoManager.m             |  27 ++
 Libraries/Video/Video.android.js              |  11 +
 Libraries/Video/Video.ios.js                  |  62 ++++
 Libraries/Video/VideoContentModes.h           |   4 +
 Libraries/Video/VideoContentModes.m           |  14 +
 Libraries/Video/VideoResizeMode.js            |  11 +
 Libraries/Video/VideoStylePropTypes.js        |  12 +
 11 files changed, 493 insertions(+)
 create mode 100644 Libraries/Video/RCTVideo.h
 create mode 100644 Libraries/Video/RCTVideo.m
 create mode 100644 Libraries/Video/RCTVideo.xcodeproj/project.pbxproj
 create mode 100644 Libraries/Video/RCTVideoManager.h
 create mode 100644 Libraries/Video/RCTVideoManager.m
 create mode 100644 Libraries/Video/Video.android.js
 create mode 100644 Libraries/Video/Video.ios.js
 create mode 100644 Libraries/Video/VideoContentModes.h
 create mode 100644 Libraries/Video/VideoContentModes.m
 create mode 100644 Libraries/Video/VideoResizeMode.js
 create mode 100644 Libraries/Video/VideoStylePropTypes.js

diff --git a/Libraries/Video/RCTVideo.h b/Libraries/Video/RCTVideo.h
new file mode 100644
index 00000000000000..228a0e199c46bc
--- /dev/null
+++ b/Libraries/Video/RCTVideo.h
@@ -0,0 +1,11 @@
+#import <UIKit/UIKit.h>
+
+@class RCTEventDispatcher;
+
+@interface RCTVideo : UIView
+
+- (instancetype)initWithEventDispatcher:(RCTEventDispatcher *)eventDispatcher NS_DESIGNATED_INITIALIZER;
+- (void)initFromSource:(NSString *)source;
+- (void)setResizeMode:(NSInteger)mode;
+
+@end
diff --git a/Libraries/Video/RCTVideo.m b/Libraries/Video/RCTVideo.m
new file mode 100644
index 00000000000000..6bbc47aad19126
--- /dev/null
+++ b/Libraries/Video/RCTVideo.m
@@ -0,0 +1,72 @@
+#import "RCTVideo.h"
+
+#import "RCTEventDispatcher.h"
+#import "RCTLog.h"
+#import "RCTUtils.h"
+#import "RCTView.h"
+#import "RCTViewControllerProtocol.h"
+#import "RCTWrapperViewController.h"
+#import "UIView+React.h"
+
+@import MediaPlayer;
+
+@implementation RCTVideo
+{
+    MPMoviePlayerController *_player;
+    RCTEventDispatcher *_eventDispatcher;
+}
+
+- (id)initWithEventDispatcher:(RCTEventDispatcher *)eventDispatcher
+{
+    if ((self = [super initWithFrame:CGRectZero])) {
+        _eventDispatcher = eventDispatcher;
+        _player = [[MPMoviePlayerController alloc] init];
+        [self addSubview: _player.view];
+
+    }
+    return self;
+}
+
+- (void)initFromSource:(NSString *)source
+{
+    NSLog(@"got here!");
+    NSURL *videoURL = [[NSURL alloc] initFileURLWithPath:[[NSBundle mainBundle] pathForResource:source ofType:@"mp4"]];
+    [_player setContentURL:videoURL];
+    [_player setControlStyle:MPMovieControlStyleNone];
+    [_player setScalingMode:MPMovieScalingModeNone];
+    [_player setRepeatMode:MPMovieRepeatModeOne];
+    [_player.view setFrame: self.bounds];
+    [_player prepareToPlay];
+    [_player play];
+}
+
+- (void)setResizeMode:(NSInteger)mode
+{
+    [_player setScalingMode:mode];
+}
+
+- (NSArray *)reactSubviews
+{
+    NSArray *subviews = @[_player.view];
+    return subviews;
+}
+
+- (void)insertReactSubview:(UIView *)view atIndex:(NSInteger)atIndex
+{
+    RCTLogError(@"video cannot have any subviews");
+    return;
+}
+
+- (void)removeReactSubview:(UIView *)subview
+{
+    RCTLogError(@"video cannot have any subviews");
+    return;
+}
+
+- (void)layoutSubviews
+{
+    [super layoutSubviews];
+    _player.view.frame = self.bounds;
+}
+
+@end
diff --git a/Libraries/Video/RCTVideo.xcodeproj/project.pbxproj b/Libraries/Video/RCTVideo.xcodeproj/project.pbxproj
new file mode 100644
index 00000000000000..63f968f9e0771d
--- /dev/null
+++ b/Libraries/Video/RCTVideo.xcodeproj/project.pbxproj
@@ -0,0 +1,264 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 46;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		BBD49E3F1AC8DEF000610F8E /* RCTVideo.m in Sources */ = {isa = PBXBuildFile; fileRef = BBD49E3A1AC8DEF000610F8E /* RCTVideo.m */; };
+		BBD49E401AC8DEF000610F8E /* RCTVideoManager.m in Sources */ = {isa = PBXBuildFile; fileRef = BBD49E3C1AC8DEF000610F8E /* RCTVideoManager.m */; };
+		BBD49E411AC8DEF000610F8E /* VideoContentModes.m in Sources */ = {isa = PBXBuildFile; fileRef = BBD49E3E1AC8DEF000610F8E /* VideoContentModes.m */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXCopyFilesBuildPhase section */
+		58B511D91A9E6C8500147676 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "include/$(PRODUCT_NAME)";
+			dstSubfolderSpec = 16;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
+/* 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>"; };
+		BBD49E3D1AC8DEF000610F8E /* VideoContentModes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoContentModes.h; sourceTree = "<group>"; };
+		BBD49E3E1AC8DEF000610F8E /* VideoContentModes.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VideoContentModes.m; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		58B511D81A9E6C8500147676 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		134814211AA4EA7D00B7C361 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				134814201AA4EA6300B7C361 /* libRCTVideo.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		58B511D21A9E6C8500147676 = {
+			isa = PBXGroup;
+			children = (
+				BBD49E391AC8DEF000610F8E /* RCTVideo.h */,
+				BBD49E3A1AC8DEF000610F8E /* RCTVideo.m */,
+				BBD49E3B1AC8DEF000610F8E /* RCTVideoManager.h */,
+				BBD49E3C1AC8DEF000610F8E /* RCTVideoManager.m */,
+				BBD49E3D1AC8DEF000610F8E /* VideoContentModes.h */,
+				BBD49E3E1AC8DEF000610F8E /* VideoContentModes.m */,
+				134814211AA4EA7D00B7C361 /* Products */,
+			);
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		58B511DA1A9E6C8500147676 /* RCTVideo */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 58B511EF1A9E6C8500147676 /* Build configuration list for PBXNativeTarget "RCTVideo" */;
+			buildPhases = (
+				58B511D71A9E6C8500147676 /* Sources */,
+				58B511D81A9E6C8500147676 /* Frameworks */,
+				58B511D91A9E6C8500147676 /* CopyFiles */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = RCTVideo;
+			productName = RCTDataManager;
+			productReference = 134814201AA4EA6300B7C361 /* libRCTVideo.a */;
+			productType = "com.apple.product-type.library.static";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		58B511D31A9E6C8500147676 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 0610;
+				ORGANIZATIONNAME = Facebook;
+				TargetAttributes = {
+					58B511DA1A9E6C8500147676 = {
+						CreatedOnToolsVersion = 6.1.1;
+					};
+				};
+			};
+			buildConfigurationList = 58B511D61A9E6C8500147676 /* Build configuration list for PBXProject "RCTVideo" */;
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+			);
+			mainGroup = 58B511D21A9E6C8500147676;
+			productRefGroup = 58B511D21A9E6C8500147676;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				58B511DA1A9E6C8500147676 /* RCTVideo */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXSourcesBuildPhase section */
+		58B511D71A9E6C8500147676 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				BBD49E3F1AC8DEF000610F8E /* RCTVideo.m in Sources */,
+				BBD49E411AC8DEF000610F8E /* VideoContentModes.m in Sources */,
+				BBD49E401AC8DEF000610F8E /* RCTVideoManager.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+		58B511ED1A9E6C8500147676 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
+				MTL_ENABLE_DEBUG_INFO = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = iphoneos;
+			};
+			name = Debug;
+		};
+		58B511EE1A9E6C8500147676 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = YES;
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				SDKROOT = iphoneos;
+				VALIDATE_PRODUCT = YES;
+			};
+			name = Release;
+		};
+		58B511F01A9E6C8500147676 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
+					"$(SRCROOT)/../../React/**",
+				);
+				LIBRARY_SEARCH_PATHS = "$(inherited)";
+				OTHER_LDFLAGS = "-ObjC";
+				PRODUCT_NAME = RCTVideo;
+				SKIP_INSTALL = YES;
+				USER_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../../**";
+			};
+			name = Debug;
+		};
+		58B511F11A9E6C8500147676 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
+					"$(SRCROOT)/../../React/**",
+				);
+				LIBRARY_SEARCH_PATHS = "$(inherited)";
+				OTHER_LDFLAGS = "-ObjC";
+				PRODUCT_NAME = RCTVideo;
+				SKIP_INSTALL = YES;
+				USER_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../../**";
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		58B511D61A9E6C8500147676 /* Build configuration list for PBXProject "RCTVideo" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				58B511ED1A9E6C8500147676 /* Debug */,
+				58B511EE1A9E6C8500147676 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		58B511EF1A9E6C8500147676 /* Build configuration list for PBXNativeTarget "RCTVideo" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				58B511F01A9E6C8500147676 /* Debug */,
+				58B511F11A9E6C8500147676 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 58B511D31A9E6C8500147676 /* Project object */;
+}
diff --git a/Libraries/Video/RCTVideoManager.h b/Libraries/Video/RCTVideoManager.h
new file mode 100644
index 00000000000000..dde4aef33932b3
--- /dev/null
+++ b/Libraries/Video/RCTVideoManager.h
@@ -0,0 +1,5 @@
+#import "RCTViewManager.h"
+
+@interface RCTVideoManager : RCTViewManager
+
+@end
diff --git a/Libraries/Video/RCTVideoManager.m b/Libraries/Video/RCTVideoManager.m
new file mode 100644
index 00000000000000..d38acdea0dc10b
--- /dev/null
+++ b/Libraries/Video/RCTVideoManager.m
@@ -0,0 +1,27 @@
+#import "RCTVideoManager.h"
+#import "RCTVideo.h"
+#import "RCTBridge.h"
+
+@implementation RCTVideoManager
+
+@synthesize bridge = _bridge;
+
+- (UIView *)view
+{
+    return [[RCTVideo alloc] initWithEventDispatcher:_bridge.eventDispatcher];
+}
+
+RCT_CUSTOM_VIEW_PROPERTY(src, NSString, RCTVideo)
+{
+    if (json) {
+        [view initFromSource:[RCTConvert NSString:json]];
+    }
+}
+
+RCT_CUSTOM_VIEW_PROPERTY(resizeMode, NSInteger, RCTVideo)
+{
+    [view setResizeMode:[RCTConvert NSInteger:json]];
+}
+
+
+@end
diff --git a/Libraries/Video/Video.android.js b/Libraries/Video/Video.android.js
new file mode 100644
index 00000000000000..a8a9b102c8b324
--- /dev/null
+++ b/Libraries/Video/Video.android.js
@@ -0,0 +1,11 @@
+'use strict';
+
+var warning = require('warning');
+
+var Video = {
+  test: function() {
+    warning("Not yet implemented for Android.");
+  }
+};
+
+module.exports = Video;
diff --git a/Libraries/Video/Video.ios.js b/Libraries/Video/Video.ios.js
new file mode 100644
index 00000000000000..583f82fc81cc26
--- /dev/null
+++ b/Libraries/Video/Video.ios.js
@@ -0,0 +1,62 @@
+var React = require('React');
+var NativeModules = require('NativeModules');
+var ReactIOSViewAttributes = require('ReactIOSViewAttributes');
+var StyleSheet = require('StyleSheet');
+var createReactIOSNativeComponentClass = require('createReactIOSNativeComponentClass');
+var PropTypes = require('ReactPropTypes');
+var StyleSheetPropType = require('StyleSheetPropType');
+var VideoResizeMode = require('./VideoResizeMode');
+var VideoStylePropTypes = require('./VideoStylePropTypes');
+var NativeMethodsMixin = require('NativeMethodsMixin');
+var flattenStyle = require('flattenStyle');
+var merge = require('merge');
+
+var Video = React.createClass({
+  propTypes: {
+    source: PropTypes.string,
+    style: StyleSheetPropType(VideoStylePropTypes),
+  },
+
+  mixins: [NativeMethodsMixin],
+
+  viewConfig: {
+    uiViewClassName: 'UIView',
+    validAttributes: ReactIOSViewAttributes.UIView
+  },
+
+  render: function() {
+    var style = flattenStyle([styles.base, this.props.style]);
+    var source = this.props.source;
+
+    var resizeMode;
+    var contentModes = NativeModules.VideoContentModes;
+    if (style.resizeMode === VideoResizeMode.stretch) {
+      resizeMode = contentModes.ScaleToFill;
+    } else if (style.resizeMode === VideoResizeMode.contain) {
+      resizeMode = contentModes.ScaleAspectFit;
+    } else {
+      resizeMode = contentModes.ScaleAspectFill;
+    }
+
+    var nativeProps = merge(this.props, {
+      style,
+      resizeMode,
+      src: source,
+    });
+
+    return <RCTVideo {... nativeProps} />
+  },
+});
+
+var RCTVideo = createReactIOSNativeComponentClass({
+  validAttributes: merge(ReactIOSViewAttributes.UIView, {src: true, resizeMode: true}),
+  uiViewClassName: 'RCTVideo',
+});
+
+var styles = StyleSheet.create({
+  base: {
+    overflow: 'hidden',
+  },
+});
+
+module.exports = Video;
diff --git a/Libraries/Video/VideoContentModes.h b/Libraries/Video/VideoContentModes.h
new file mode 100644
index 00000000000000..c0d650f8673dc9
--- /dev/null
+++ b/Libraries/Video/VideoContentModes.h
@@ -0,0 +1,4 @@
+#import "RCTBridgeModule.h"
+
+@interface VideoContentModes : NSObject <RCTBridgeModule>
+@end
diff --git a/Libraries/Video/VideoContentModes.m b/Libraries/Video/VideoContentModes.m
new file mode 100644
index 00000000000000..0b1c07fbc4dad0
--- /dev/null
+++ b/Libraries/Video/VideoContentModes.m
@@ -0,0 +1,14 @@
+#import "VideoContentModes.h"
+@import MediaPlayer;
+
+@implementation VideoContentModes
+
+- (NSDictionary *)constantsToExport
+{
+    return @{@"ScaleNone": @(MPMovieScalingModeNone),
+             @"ScaleToFill": @(MPMovieScalingModeFill),
+             @"ScaleAspectFit": @(MPMovieScalingModeAspectFit),
+             @"ScaleAspectFill": @(MPMovieScalingModeAspectFill)};
+}
+
+@end
diff --git a/Libraries/Video/VideoResizeMode.js b/Libraries/Video/VideoResizeMode.js
new file mode 100644
index 00000000000000..2610b64abf7722
--- /dev/null
+++ b/Libraries/Video/VideoResizeMode.js
@@ -0,0 +1,11 @@
+'use strict';
+
+var keyMirror = require('keyMirror');
+
+var VideoResizeMode = keyMirror({
+  contain: null,
+  cover: null,
+  stretch: null,
+});
+
+module.exports = VideoResizeMode;
diff --git a/Libraries/Video/VideoStylePropTypes.js b/Libraries/Video/VideoStylePropTypes.js
new file mode 100644
index 00000000000000..badebfefed2edf
--- /dev/null
+++ b/Libraries/Video/VideoStylePropTypes.js
@@ -0,0 +1,12 @@
+'use strict';
+
+var VideoResizeMode = require('./VideoResizeMode');
+var LayoutPropTypes = require('LayoutPropTypes');
+var ReactPropTypes = require('ReactPropTypes');
+
+var VideoStylePropTypes = {
+  ...LayoutPropTypes,
+  resizeMode: ReactPropTypes.oneOf(Object.keys(VideoResizeMode)),
+};
+
+module.exports = VideoStylePropTypes;

From c31489c8aa1aa8614b42370ba4366ec1c32ac1e4 Mon Sep 17 00:00:00 2001
From: Brent Vatne <brent.vatne@madriska.com>
Date: Sun, 29 Mar 2015 19:30:08 -0700
Subject: [PATCH 2/3] Update based on feedback from @tadeuzagallo

---
 .../contents.xcworkspacedata                  |  7 +++
 Libraries/Video/RCTVideo.h                    |  6 --
 Libraries/Video/RCTVideo.m                    | 60 ++++++++-----------
 .../contents.xcworkspacedata                  |  7 +++
 Libraries/Video/RCTVideoManager.m             | 19 +++---
 Libraries/Video/Video.ios.js                  |  2 +-
 Libraries/Video/VideoContentModes.h           |  4 --
 Libraries/Video/VideoContentModes.m           | 14 -----
 8 files changed, 48 insertions(+), 71 deletions(-)
 create mode 100644 Libraries/Image/RCTImage.xcodeproj/project.xcworkspace/contents.xcworkspacedata
 create mode 100644 Libraries/Video/RCTVideo.xcodeproj/project.xcworkspace/contents.xcworkspacedata
 delete mode 100644 Libraries/Video/VideoContentModes.h
 delete mode 100644 Libraries/Video/VideoContentModes.m

diff --git a/Libraries/Image/RCTImage.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Libraries/Image/RCTImage.xcodeproj/project.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 00000000000000..a879e51aaf061f
--- /dev/null
+++ b/Libraries/Image/RCTImage.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:RCTImage.xcodeproj">
+   </FileRef>
+</Workspace>
diff --git a/Libraries/Video/RCTVideo.h b/Libraries/Video/RCTVideo.h
index 228a0e199c46bc..f0ba7ec3142b7e 100644
--- a/Libraries/Video/RCTVideo.h
+++ b/Libraries/Video/RCTVideo.h
@@ -1,11 +1,5 @@
 #import <UIKit/UIKit.h>
 
-@class RCTEventDispatcher;
-
 @interface RCTVideo : UIView
 
-- (instancetype)initWithEventDispatcher:(RCTEventDispatcher *)eventDispatcher NS_DESIGNATED_INITIALIZER;
-- (void)initFromSource:(NSString *)source;
-- (void)setResizeMode:(NSInteger)mode;
-
 @end
diff --git a/Libraries/Video/RCTVideo.m b/Libraries/Video/RCTVideo.m
index 6bbc47aad19126..0e23da0feb97a7 100644
--- a/Libraries/Video/RCTVideo.m
+++ b/Libraries/Video/RCTVideo.m
@@ -1,72 +1,60 @@
 #import "RCTVideo.h"
-
-#import "RCTEventDispatcher.h"
 #import "RCTLog.h"
-#import "RCTUtils.h"
-#import "RCTView.h"
-#import "RCTViewControllerProtocol.h"
-#import "RCTWrapperViewController.h"
-#import "UIView+React.h"
 
 @import MediaPlayer;
 
 @implementation RCTVideo
 {
-    MPMoviePlayerController *_player;
-    RCTEventDispatcher *_eventDispatcher;
+  MPMoviePlayerController *_player;
 }
 
-- (id)initWithEventDispatcher:(RCTEventDispatcher *)eventDispatcher
+- (id)init
 {
-    if ((self = [super initWithFrame:CGRectZero])) {
-        _eventDispatcher = eventDispatcher;
-        _player = [[MPMoviePlayerController alloc] init];
-        [self addSubview: _player.view];
-
-    }
-    return self;
+  if ((self = [super init])) {
+    _player = [[MPMoviePlayerController alloc] init];
+    [self addSubview: _player.view];
+  }
+  return self;
 }
 
-- (void)initFromSource:(NSString *)source
+- (void)setSrc:(NSString *)source
 {
-    NSLog(@"got here!");
-    NSURL *videoURL = [[NSURL alloc] initFileURLWithPath:[[NSBundle mainBundle] pathForResource:source ofType:@"mp4"]];
-    [_player setContentURL:videoURL];
-    [_player setControlStyle:MPMovieControlStyleNone];
-    [_player setScalingMode:MPMovieScalingModeNone];
-    [_player setRepeatMode:MPMovieRepeatModeOne];
-    [_player.view setFrame: self.bounds];
-    [_player prepareToPlay];
-    [_player play];
+  NSURL *videoURL = [[NSURL alloc] initFileURLWithPath:[[NSBundle mainBundle] pathForResource:source ofType:@"mp4"]];
+  [_player setContentURL:videoURL];
+  [_player setControlStyle:MPMovieControlStyleNone];
+  [_player setScalingMode:MPMovieScalingModeNone];
+  [_player setRepeatMode:MPMovieRepeatModeOne];
+  [_player prepareToPlay];
+  [_player play];
 }
 
 - (void)setResizeMode:(NSInteger)mode
 {
-    [_player setScalingMode:mode];
+  [_player setScalingMode:mode];
 }
 
 - (NSArray *)reactSubviews
 {
-    NSArray *subviews = @[_player.view];
-    return subviews;
+  NSArray *subviews = @[_player.view];
+  return subviews;
 }
 
 - (void)insertReactSubview:(UIView *)view atIndex:(NSInteger)atIndex
 {
-    RCTLogError(@"video cannot have any subviews");
-    return;
+  RCTLogError(@"video cannot have any subviews");
+  return;
 }
 
 - (void)removeReactSubview:(UIView *)subview
 {
-    RCTLogError(@"video cannot have any subviews");
-    return;
+  RCTLogError(@"video cannot have any subviews");
+  return;
 }
 
 - (void)layoutSubviews
 {
-    [super layoutSubviews];
-    _player.view.frame = self.bounds;
+  [super layoutSubviews];
+  _player.view.frame = self.bounds;
 }
 
 @end
diff --git a/Libraries/Video/RCTVideo.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Libraries/Video/RCTVideo.xcodeproj/project.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 00000000000000..5bde89bfcf1c7e
--- /dev/null
+++ b/Libraries/Video/RCTVideo.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:RCTVideo.xcodeproj">
+   </FileRef>
+</Workspace>
diff --git a/Libraries/Video/RCTVideoManager.m b/Libraries/Video/RCTVideoManager.m
index d38acdea0dc10b..86f7d849c2c2d0 100644
--- a/Libraries/Video/RCTVideoManager.m
+++ b/Libraries/Video/RCTVideoManager.m
@@ -1,6 +1,7 @@
 #import "RCTVideoManager.h"
 #import "RCTVideo.h"
 #import "RCTBridge.h"
+@import MediaPlayer;
 
 @implementation RCTVideoManager
 
@@ -8,20 +9,18 @@ @implementation RCTVideoManager
 
 - (UIView *)view
 {
-    return [[RCTVideo alloc] initWithEventDispatcher:_bridge.eventDispatcher];
+  return [[RCTVideo alloc] init];
 }
 
-RCT_CUSTOM_VIEW_PROPERTY(src, NSString, RCTVideo)
-{
-    if (json) {
-        [view initFromSource:[RCTConvert NSString:json]];
-    }
-}
+RCT_EXPORT_VIEW_PROPERTY(src, NSString);
+RCT_EXPORT_VIEW_PROPERTY(resizeMode, NSInteger);
 
-RCT_CUSTOM_VIEW_PROPERTY(resizeMode, NSInteger, RCTVideo)
+- (NSDictionary *)constantsToExport
 {
-    [view setResizeMode:[RCTConvert NSInteger:json]];
+  return @{@"ScaleNone": @(MPMovieScalingModeNone),
+           @"ScaleToFill": @(MPMovieScalingModeFill),
+           @"ScaleAspectFit": @(MPMovieScalingModeAspectFit),
+           @"ScaleAspectFill": @(MPMovieScalingModeAspectFill)};
 }
 
-
 @end
diff --git a/Libraries/Video/Video.ios.js b/Libraries/Video/Video.ios.js
index 583f82fc81cc26..24b3f8dae5f777 100644
--- a/Libraries/Video/Video.ios.js
+++ b/Libraries/Video/Video.ios.js
@@ -29,7 +29,7 @@ var Video = React.createClass({
     var source = this.props.source;
 
     var resizeMode;
-    var contentModes = NativeModules.VideoContentModes;
+    var contentModes = NativeModules.VideoManager;
     if (style.resizeMode === VideoResizeMode.stretch) {
       resizeMode = contentModes.ScaleToFill;
     } else if (style.resizeMode === VideoResizeMode.contain) {
diff --git a/Libraries/Video/VideoContentModes.h b/Libraries/Video/VideoContentModes.h
deleted file mode 100644
index c0d650f8673dc9..00000000000000
--- a/Libraries/Video/VideoContentModes.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#import "RCTBridgeModule.h"
-
-@interface VideoContentModes : NSObject <RCTBridgeModule>
-@end
diff --git a/Libraries/Video/VideoContentModes.m b/Libraries/Video/VideoContentModes.m
deleted file mode 100644
index 0b1c07fbc4dad0..00000000000000
--- a/Libraries/Video/VideoContentModes.m
+++ /dev/null
@@ -1,14 +0,0 @@
-#import "VideoContentModes.h"
-@import MediaPlayer;
-
-@implementation VideoContentModes
-
-- (NSDictionary *)constantsToExport
-{
-    return @{@"ScaleNone": @(MPMovieScalingModeNone),
-             @"ScaleToFill": @(MPMovieScalingModeFill),
-             @"ScaleAspectFit": @(MPMovieScalingModeAspectFit),
-             @"ScaleAspectFill": @(MPMovieScalingModeAspectFill)};
-}
-
-@end

From 94461af06be771eb2ac3b16ef63946dd99ff6a45 Mon Sep 17 00:00:00 2001
From: Brent Vatne <brent.vatne@madriska.com>
Date: Sun, 29 Mar 2015 19:41:25 -0700
Subject: [PATCH 3/3] Remove .xcworkspacedata files accidentally included

---
 .../project.xcworkspace/contents.xcworkspacedata           | 7 -------
 .../project.xcworkspace/contents.xcworkspacedata           | 7 -------
 2 files changed, 14 deletions(-)
 delete mode 100644 Libraries/Image/RCTImage.xcodeproj/project.xcworkspace/contents.xcworkspacedata
 delete mode 100644 Libraries/Video/RCTVideo.xcodeproj/project.xcworkspace/contents.xcworkspacedata

diff --git a/Libraries/Image/RCTImage.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Libraries/Image/RCTImage.xcodeproj/project.xcworkspace/contents.xcworkspacedata
deleted file mode 100644
index a879e51aaf061f..00000000000000
--- a/Libraries/Image/RCTImage.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "self:RCTImage.xcodeproj">
-   </FileRef>
-</Workspace>
diff --git a/Libraries/Video/RCTVideo.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Libraries/Video/RCTVideo.xcodeproj/project.xcworkspace/contents.xcworkspacedata
deleted file mode 100644
index 5bde89bfcf1c7e..00000000000000
--- a/Libraries/Video/RCTVideo.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "self:RCTVideo.xcodeproj">
-   </FileRef>
-</Workspace>