Skip to content

Commit 53f791e

Browse files
committed
Second Updates from Wed 25 Mar
- [MAdMan][Android] Make things look more Androidy | Philipp von Weitershausen - flowified Libraries from Avik | Basil Hosmer - flowify some Libraries | Basil Hosmer - [ReactKit] Add shake development menu | Alex Kotliarskyi - [ReactNative] Add debugger and change SampleApp files structure | Alex Kotliarskyi - Flowify ReactIOSEventEmitter | Marshall Roch - [react_native] JS files from D1941151: Allow fontWeight to be 100,200,...,900 | Krzysztof Magiera
1 parent b331a34 commit 53f791e

45 files changed

Lines changed: 455 additions & 134 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.flowconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
.*/node_modules/react-tools/src/vendor/core/ExecutionEnvironment.js
1313
.*/node_modules/react-tools/src/browser/.*
1414
.*/node_modules/react-tools/src/core/ReactInstanceHandles.js
15-
.*/node_modules/react-tools/src/event/.*
15+
.*/node_modules/react-tools/src/event/EventPropagators.js
1616

1717
# Ignore jest
1818
.*/react-native/node_modules/jest-cli/.*

Examples/SampleApp/SampleApp.xcodeproj/project.pbxproj

Lines changed: 43 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
00481BE81AC0C86700671115 /* libRCTWebSocketDebugger.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00481BE61AC0C7FA00671115 /* libRCTWebSocketDebugger.a */; };
11+
00481BEA1AC0C89D00671115 /* libicucore.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 00481BE91AC0C89D00671115 /* libicucore.dylib */; };
1012
00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302AC1ABCB8CE00DB3ED1 /* libRCTActionSheet.a */; };
1113
00C302E61ABCBA2D00DB3ED1 /* libRCTAdSupport.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302B41ABCB8E700DB3ED1 /* libRCTAdSupport.a */; };
1214
00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302BA1ABCB90400DB3ED1 /* libRCTGeolocation.a */; };
@@ -22,6 +24,13 @@
2224
/* End PBXBuildFile section */
2325

2426
/* Begin PBXContainerItemProxy section */
27+
00481BE51AC0C7FA00671115 /* PBXContainerItemProxy */ = {
28+
isa = PBXContainerItemProxy;
29+
containerPortal = 00481BDB1AC0C7FA00671115 /* RCTWebSocketDebugger.xcodeproj */;
30+
proxyType = 2;
31+
remoteGlobalIDString = 832C81801AAF6DEF007FA2F7;
32+
remoteInfo = RCTWebSocketDebugger;
33+
};
2534
00C302AB1ABCB8CE00DB3ED1 /* PBXContainerItemProxy */ = {
2635
isa = PBXContainerItemProxy;
2736
containerPortal = 00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */;
@@ -81,19 +90,21 @@
8190
/* End PBXContainerItemProxy section */
8291

8392
/* Begin PBXFileReference section */
84-
00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTActionSheet.xcodeproj; path = "../../Libraries/ActionSheetIOS/RCTActionSheet.xcodeproj"; sourceTree = "<absolute>"; };
93+
00481BDB1AC0C7FA00671115 /* RCTWebSocketDebugger.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTWebSocketDebugger.xcodeproj; path = ../../Libraries/RCTWebSocketDebugger/RCTWebSocketDebugger.xcodeproj; sourceTree = "<group>"; };
94+
00481BE91AC0C89D00671115 /* libicucore.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libicucore.dylib; path = usr/lib/libicucore.dylib; sourceTree = SDKROOT; };
95+
00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTActionSheet.xcodeproj; path = ../../Libraries/ActionSheetIOS/RCTActionSheet.xcodeproj; sourceTree = "<absolute>"; };
8596
00C302AF1ABCB8E700DB3ED1 /* RCTAdSupport.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAdSupport.xcodeproj; path = ../../Libraries/AdSupport/RCTAdSupport.xcodeproj; sourceTree = "<group>"; };
8697
00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTGeolocation.xcodeproj; path = ../../Libraries/Geolocation/RCTGeolocation.xcodeproj; sourceTree = "<group>"; };
8798
00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTImage.xcodeproj; path = ../../Libraries/Image/RCTImage.xcodeproj; sourceTree = "<group>"; };
8899
00C302D31ABCB9D200DB3ED1 /* RCTNetwork.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTNetwork.xcodeproj; path = ../../Libraries/Network/RCTNetwork.xcodeproj; sourceTree = "<group>"; };
89100
00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTVibration.xcodeproj; path = ../../Libraries/Vibration/RCTVibration.xcodeproj; sourceTree = "<group>"; };
90101
13B07F961A680F5B00A75B9A /* SampleApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SampleApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
91-
13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = SampleApp/AppDelegate.h; sourceTree = "<group>"; };
92-
13B07FB01A68108700A75B9A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = SampleApp/AppDelegate.m; sourceTree = "<group>"; };
102+
13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = iOS/AppDelegate.h; sourceTree = "<group>"; };
103+
13B07FB01A68108700A75B9A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = iOS/AppDelegate.m; sourceTree = "<group>"; };
93104
13B07FB21A68108700A75B9A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = "<group>"; };
94-
13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = SampleApp/Images.xcassets; sourceTree = "<group>"; };
95-
13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = SampleApp/Info.plist; sourceTree = "<group>"; };
96-
13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = SampleApp/main.m; sourceTree = "<group>"; };
105+
13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = iOS/Images.xcassets; sourceTree = "<group>"; };
106+
13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = iOS/Info.plist; sourceTree = "<group>"; };
107+
13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = iOS/main.m; sourceTree = "<group>"; };
97108
832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = ../../Libraries/Text/RCTText.xcodeproj; sourceTree = "<group>"; };
98109
834D32361A76971A00F38302 /* ReactKit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ReactKit.xcodeproj; path = ../../ReactKit/ReactKit.xcodeproj; sourceTree = "<group>"; };
99110
/* End PBXFileReference section */
@@ -103,6 +114,8 @@
103114
isa = PBXFrameworksBuildPhase;
104115
buildActionMask = 2147483647;
105116
files = (
117+
00481BEA1AC0C89D00671115 /* libicucore.dylib in Frameworks */,
118+
00481BE81AC0C86700671115 /* libRCTWebSocketDebugger.a in Frameworks */,
106119
00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */,
107120
00C302E61ABCBA2D00DB3ED1 /* libRCTAdSupport.a in Frameworks */,
108121
00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */,
@@ -117,6 +130,14 @@
117130
/* End PBXFrameworksBuildPhase section */
118131

119132
/* Begin PBXGroup section */
133+
00481BDC1AC0C7FA00671115 /* Products */ = {
134+
isa = PBXGroup;
135+
children = (
136+
00481BE61AC0C7FA00671115 /* libRCTWebSocketDebugger.a */,
137+
);
138+
name = Products;
139+
sourceTree = "<group>";
140+
};
120141
00C302A81ABCB8CE00DB3ED1 /* Products */ = {
121142
isa = PBXGroup;
122143
children = (
@@ -189,6 +210,8 @@
189210
00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */,
190211
00C302D31ABCB9D200DB3ED1 /* RCTNetwork.xcodeproj */,
191212
00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */,
213+
00481BDB1AC0C7FA00671115 /* RCTWebSocketDebugger.xcodeproj */,
214+
00481BE91AC0C89D00671115 /* libicucore.dylib */,
192215
);
193216
name = Libraries;
194217
sourceTree = "<group>";
@@ -295,6 +318,10 @@
295318
ProductGroup = 00C302E01ABCB9EE00DB3ED1 /* Products */;
296319
ProjectRef = 00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */;
297320
},
321+
{
322+
ProductGroup = 00481BDC1AC0C7FA00671115 /* Products */;
323+
ProjectRef = 00481BDB1AC0C7FA00671115 /* RCTWebSocketDebugger.xcodeproj */;
324+
},
298325
{
299326
ProductGroup = 832348241A77B50100B55238 /* Products */;
300327
ProjectRef = 834D32361A76971A00F38302 /* ReactKit.xcodeproj */;
@@ -308,6 +335,13 @@
308335
/* End PBXProject section */
309336

310337
/* Begin PBXReferenceProxy section */
338+
00481BE61AC0C7FA00671115 /* libRCTWebSocketDebugger.a */ = {
339+
isa = PBXReferenceProxy;
340+
fileType = archive.ar;
341+
path = libRCTWebSocketDebugger.a;
342+
remoteRef = 00481BE51AC0C7FA00671115 /* PBXContainerItemProxy */;
343+
sourceTree = BUILT_PRODUCTS_DIR;
344+
};
311345
00C302AC1ABCB8CE00DB3ED1 /* libRCTActionSheet.a */ = {
312346
isa = PBXReferenceProxy;
313347
fileType = archive.ar;
@@ -397,7 +431,7 @@
397431
13B07FB21A68108700A75B9A /* Base */,
398432
);
399433
name = LaunchScreen.xib;
400-
path = SampleApp;
434+
path = iOS;
401435
sourceTree = "<group>";
402436
};
403437
/* End PBXVariantGroup section */
@@ -407,7 +441,7 @@
407441
isa = XCBuildConfiguration;
408442
buildSettings = {
409443
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
410-
INFOPLIST_FILE = "$(SRCROOT)/SampleApp/Info.plist";
444+
INFOPLIST_FILE = "$(SRCROOT)/iOS/Info.plist";
411445
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
412446
OTHER_LDFLAGS = "-ObjC";
413447
PRODUCT_NAME = SampleApp;
@@ -418,7 +452,7 @@
418452
isa = XCBuildConfiguration;
419453
buildSettings = {
420454
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
421-
INFOPLIST_FILE = "$(SRCROOT)/SampleApp/Info.plist";
455+
INFOPLIST_FILE = "$(SRCROOT)/iOS/Info.plist";
422456
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
423457
OTHER_LDFLAGS = "-ObjC";
424458
PRODUCT_NAME = SampleApp;
File renamed without changes.

Examples/SampleApp/SampleApp/AppDelegate.m renamed to Examples/SampleApp/iOS/AppDelegate.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
2727
//
2828
// To run on device, change `localhost` to the IP address of your computer, and make sure your computer and
2929
// iOS device are on the same Wi-Fi network.
30-
jsCodeLocation = [NSURL URLWithString:@"http://localhost:8081/Examples/SampleApp/index.ios.runModule.bundle"];
30+
jsCodeLocation = [NSURL URLWithString:@"http://localhost:8081/Examples/SampleApp/index.ios.bundle"];
3131

3232
// OPTION 2
3333
// Load from pre-bundled file on disk. To re-generate the static bundle, run
3434
//
35-
// $ curl http://localhost:8081/Examples/SampleApp/index.ios.runModule.bundle -o main.jsbundle
35+
// $ curl http://localhost:8081/Examples/SampleApp/index.ios.bundle -o main.jsbundle
3636
//
3737
// and uncomment the next following line
3838
// jsCodeLocation = [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];

Examples/SampleApp/SampleApp/Base.lproj/LaunchScreen.xib renamed to Examples/SampleApp/iOS/Base.lproj/LaunchScreen.xib

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6254" systemVersion="14C109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6751" systemVersion="14C1510" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
33
<dependencies>
4-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6247"/>
4+
<deployment identifier="iOS"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6736"/>
56
<capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
67
</dependencies>
78
<objects>
@@ -11,7 +12,7 @@
1112
<rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
1213
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
1314
<subviews>
14-
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" Copyright (c) 2015 Facebook. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
15+
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Powered by React Native" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
1516
<rect key="frame" x="20" y="439" width="441" height="21"/>
1617
<fontDescription key="fontDescription" type="system" pointSize="17"/>
1718
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>

Examples/SampleApp/SampleApp/Images.xcassets/AppIcon.appiconset/Contents.json renamed to Examples/SampleApp/iOS/Images.xcassets/AppIcon.appiconset/Contents.json

File renamed without changes.

Examples/UIExplorer/UIExplorer/AppDelegate.m

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
#import "AppDelegate.h"
1111

12+
#import "RCTDevelopmentViewController.h"
1213
#import "RCTRootView.h"
1314

1415
@implementation AppDelegate
@@ -41,7 +42,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
4142
rootView.moduleName = @"UIExplorerApp";
4243

4344
self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
44-
UIViewController *rootViewController = [[UIViewController alloc] init];
45+
UIViewController *rootViewController = [[RCTDevelopmentViewController alloc] init];
4546
rootViewController.view = rootView;
4647
self.window.rootViewController = rootViewController;
4748
[self.window makeKeyAndVisible];

Libraries/BatchedBridge/BatchedBridgedModules/NativeModules.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
* of patent rights can be found in the PATENTS file in the same directory.
88
*
99
* @providesModule NativeModules
10+
* @flow
1011
*/
1112
'use strict';
1213

0 commit comments

Comments
 (0)