Skip to content

Commit da1aa96

Browse files
vjeuxvjeux
committed
Updates from Thu 14 May
2 parents b2d1d6f + 22fb03d commit da1aa96

56 files changed

Lines changed: 2380 additions & 2391 deletions

Some content is hidden

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

‎.eslintrc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
"document": false,
1717
"escape": false,
1818
"exports": false,
19+
"fetch": false,
1920
"global": false,
2021
"jest": false,
2122
"Map": true,

‎Examples/SampleApp/SampleApp.xcodeproj/project.pbxproj‎

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

99
/* Begin PBXBuildFile section */
10-
00481BE81AC0C86700671115 /* libRCTWebSocketDebugger.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00481BE61AC0C7FA00671115 /* libRCTWebSocketDebugger.a */; };
1110
008F07F31AC5B25A0029DE68 /* main.jsbundle in Resources */ = {isa = PBXBuildFile; fileRef = 008F07F21AC5B25A0029DE68 /* main.jsbundle */; };
1211
00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302AC1ABCB8CE00DB3ED1 /* libRCTActionSheet.a */; };
1312
00C302E61ABCBA2D00DB3ED1 /* libRCTAdSupport.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302B41ABCB8E700DB3ED1 /* libRCTAdSupport.a */; };
@@ -27,13 +26,6 @@
2726
/* End PBXBuildFile section */
2827

2928
/* Begin PBXContainerItemProxy section */
30-
00481BE51AC0C7FA00671115 /* PBXContainerItemProxy */ = {
31-
isa = PBXContainerItemProxy;
32-
containerPortal = 00481BDB1AC0C7FA00671115 /* RCTWebSocketDebugger.xcodeproj */;
33-
proxyType = 2;
34-
remoteGlobalIDString = 832C81801AAF6DEF007FA2F7;
35-
remoteInfo = RCTWebSocketDebugger;
36-
};
3729
00C302AB1ABCB8CE00DB3ED1 /* PBXContainerItemProxy */ = {
3830
isa = PBXContainerItemProxy;
3931
containerPortal = 00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */;
@@ -114,7 +106,6 @@
114106
/* End PBXContainerItemProxy section */
115107

116108
/* Begin PBXFileReference section */
117-
00481BDB1AC0C7FA00671115 /* RCTWebSocketDebugger.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTWebSocketDebugger.xcodeproj; path = ../../Libraries/RCTWebSocketDebugger/RCTWebSocketDebugger.xcodeproj; sourceTree = "<group>"; };
118109
008F07F21AC5B25A0029DE68 /* main.jsbundle */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = main.jsbundle; path = iOS/main.jsbundle; sourceTree = "<group>"; };
119110
00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTActionSheet.xcodeproj; path = ../../Libraries/ActionSheetIOS/RCTActionSheet.xcodeproj; sourceTree = "<group>"; };
120111
00C302AF1ABCB8E700DB3ED1 /* RCTAdSupport.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAdSupport.xcodeproj; path = ../../Libraries/AdSupport/RCTAdSupport.xcodeproj; sourceTree = "<group>"; };
@@ -151,30 +142,21 @@
151142
buildActionMask = 2147483647;
152143
files = (
153144
146834051AC3E58100842450 /* libReact.a in Frameworks */,
154-
139105C61AF99C1200B5F7CC /* libRCTSettings.a in Frameworks */,
155-
00481BE81AC0C86700671115 /* libRCTWebSocketDebugger.a in Frameworks */,
156145
00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */,
157146
00C302E61ABCBA2D00DB3ED1 /* libRCTAdSupport.a in Frameworks */,
158147
00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */,
159148
00C302E81ABCBA2D00DB3ED1 /* libRCTImage.a in Frameworks */,
160149
133E29F31AD74F7200F7D852 /* libRCTLinking.a in Frameworks */,
161150
00C302E91ABCBA2D00DB3ED1 /* libRCTNetwork.a in Frameworks */,
162-
00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */,
151+
139105C61AF99C1200B5F7CC /* libRCTSettings.a in Frameworks */,
163152
832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */,
153+
00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */,
164154
);
165155
runOnlyForDeploymentPostprocessing = 0;
166156
};
167157
/* End PBXFrameworksBuildPhase section */
168158

169159
/* Begin PBXGroup section */
170-
00481BDC1AC0C7FA00671115 /* Products */ = {
171-
isa = PBXGroup;
172-
children = (
173-
00481BE61AC0C7FA00671115 /* libRCTWebSocketDebugger.a */,
174-
);
175-
name = Products;
176-
sourceTree = "<group>";
177-
};
178160
00C302A81ABCB8CE00DB3ED1 /* Products */ = {
179161
isa = PBXGroup;
180162
children = (
@@ -291,7 +273,6 @@
291273
139105B61AF99BAD00B5F7CC /* RCTSettings.xcodeproj */,
292274
832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */,
293275
00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */,
294-
00481BDB1AC0C7FA00671115 /* RCTWebSocketDebugger.xcodeproj */,
295276
);
296277
name = Libraries;
297278
sourceTree = "<group>";
@@ -426,10 +407,6 @@
426407
ProductGroup = 00C302E01ABCB9EE00DB3ED1 /* Products */;
427408
ProjectRef = 00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */;
428409
},
429-
{
430-
ProductGroup = 00481BDC1AC0C7FA00671115 /* Products */;
431-
ProjectRef = 00481BDB1AC0C7FA00671115 /* RCTWebSocketDebugger.xcodeproj */;
432-
},
433410
{
434411
ProductGroup = 146834001AC3E56700842450 /* Products */;
435412
ProjectRef = 146833FF1AC3E56700842450 /* React.xcodeproj */;
@@ -444,13 +421,6 @@
444421
/* End PBXProject section */
445422

446423
/* Begin PBXReferenceProxy section */
447-
00481BE61AC0C7FA00671115 /* libRCTWebSocketDebugger.a */ = {
448-
isa = PBXReferenceProxy;
449-
fileType = archive.ar;
450-
path = libRCTWebSocketDebugger.a;
451-
remoteRef = 00481BE51AC0C7FA00671115 /* PBXContainerItemProxy */;
452-
sourceTree = BUILT_PRODUCTS_DIR;
453-
};
454424
00C302AC1ABCB8CE00DB3ED1 /* libRCTActionSheet.a */ = {
455425
isa = PBXReferenceProxy;
456426
fileType = archive.ar;

‎Examples/UIExplorer/ExampleTypes.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,3 @@ export type ExampleModule = {
2727
examples: Array<Example>;
2828
external?: bool;
2929
};
30-

‎Examples/UIExplorer/MapViewExample.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ var regionText = {
2929
longitude: '0',
3030
latitudeDelta: '0',
3131
longitudeDelta: '0',
32-
}
32+
};
3333

3434
var MapRegionInput = React.createClass({
3535

‎Examples/UIExplorer/NavigatorIOSColorsExample.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ var NavigatorIOSColors = React.createClass({
4545

4646
render: function() {
4747
// Set StatusBar with light contents to get better contrast
48-
StatusBarIOS.setStyle(StatusBarIOS.Style['lightContent']);
48+
StatusBarIOS.setStyle(StatusBarIOS.Style.lightContent);
4949

5050
return (
5151
<NavigatorIOS

‎Examples/UIExplorer/TabBarIOSExample.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ var TabBarExample = React.createClass({
7878
this.setState({
7979
selectedTab: 'greenTab',
8080
presses: this.state.presses + 1
81-
});
81+
});
8282
}}>
8383
{this._renderContent('#21551C', 'Green Tab')}
8484
</TabBarIOS.Item>

‎Examples/UIExplorer/TextInputExample.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@ exports.examples = [
387387
<View style={styles.multilineChild}/>
388388
</TextInput>
389389
</View>
390-
)
390+
);
391391
}
392392
}
393393
];

‎Examples/UIExplorer/UIExplorer.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
/* Begin PBXBuildFile section */
1010
004D28A31AAF61C70097A701 /* UIExplorerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 004D28A21AAF61C70097A701 /* UIExplorerTests.m */; };
11-
00D2771A1AB8C3E100DC1E48 /* libRCTWebSocketDebugger.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00D277131AB8C2C700DC1E48 /* libRCTWebSocketDebugger.a */; };
1211
13417FE91AA91432003F314A /* libRCTImage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 13417FE81AA91428003F314A /* libRCTImage.a */; };
1312
134180011AA9153C003F314A /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 13417FEF1AA914B8003F314A /* libRCTText.a */; };
1413
1341802C1AA9178B003F314A /* libRCTNetwork.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1341802B1AA91779003F314A /* libRCTNetwork.a */; };
@@ -34,13 +33,6 @@
3433
remoteGlobalIDString = 13B07F861A680F5B00A75B9A;
3534
remoteInfo = UIExplorer;
3635
};
37-
00D277121AB8C2C700DC1E48 /* PBXContainerItemProxy */ = {
38-
isa = PBXContainerItemProxy;
39-
containerPortal = 00D2770E1AB8C2C700DC1E48 /* RCTWebSocketDebugger.xcodeproj */;
40-
proxyType = 2;
41-
remoteGlobalIDString = 832C81801AAF6DEF007FA2F7;
42-
remoteInfo = RCTWebSocketDebugger;
43-
};
4436
13417FE71AA91428003F314A /* PBXContainerItemProxy */ = {
4537
isa = PBXContainerItemProxy;
4638
containerPortal = 13417FE31AA91428003F314A /* RCTImage.xcodeproj */;
@@ -124,7 +116,6 @@
124116
004D289E1AAF61C70097A701 /* UIExplorerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = UIExplorerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
125117
004D28A11AAF61C70097A701 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
126118
004D28A21AAF61C70097A701 /* UIExplorerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UIExplorerTests.m; sourceTree = "<group>"; };
127-
00D2770E1AB8C2C700DC1E48 /* RCTWebSocketDebugger.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTWebSocketDebugger.xcodeproj; path = ../../Libraries/RCTWebSocketDebugger/RCTWebSocketDebugger.xcodeproj; sourceTree = "<group>"; };
128119
13417FE31AA91428003F314A /* RCTImage.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTImage.xcodeproj; path = ../../Libraries/Image/RCTImage.xcodeproj; sourceTree = "<group>"; };
129120
13417FEA1AA914B8003F314A /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = ../../Libraries/Text/RCTText.xcodeproj; sourceTree = "<group>"; };
130121
134180261AA91779003F314A /* RCTNetwork.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTNetwork.xcodeproj; path = ../../Libraries/Network/RCTNetwork.xcodeproj; sourceTree = "<group>"; };
@@ -159,7 +150,6 @@
159150
files = (
160151
834C36EC1AF8DED70019C93C /* libRCTSettings.a in Frameworks */,
161152
14AADF051AC3DBB1002390C9 /* libReact.a in Frameworks */,
162-
00D2771A1AB8C3E100DC1E48 /* libRCTWebSocketDebugger.a in Frameworks */,
163153
58005BF21ABA80A60062E044 /* libRCTTest.a in Frameworks */,
164154
D85B829E1AB6D5D7003F4FE2 /* libRCTVibration.a in Frameworks */,
165155
14DC67F41AB71881001358AB /* libRCTPushNotification.a in Frameworks */,
@@ -192,14 +182,6 @@
192182
name = "Supporting Files";
193183
sourceTree = "<group>";
194184
};
195-
00D2770F1AB8C2C700DC1E48 /* Products */ = {
196-
isa = PBXGroup;
197-
children = (
198-
00D277131AB8C2C700DC1E48 /* libRCTWebSocketDebugger.a */,
199-
);
200-
name = Products;
201-
sourceTree = "<group>";
202-
};
203185
1316A21D1AA397F400C0188E /* Libraries */ = {
204186
isa = PBXGroup;
205187
children = (
@@ -213,7 +195,6 @@
213195
13CC9D481AEED2B90020D1C2 /* RCTSettings.xcodeproj */,
214196
58005BE41ABA80530062E044 /* RCTTest.xcodeproj */,
215197
13417FEA1AA914B8003F314A /* RCTText.xcodeproj */,
216-
00D2770E1AB8C2C700DC1E48 /* RCTWebSocketDebugger.xcodeproj */,
217198
D85B82911AB6D5CE003F4FE2 /* RCTVibration.xcodeproj */,
218199
);
219200
name = Libraries;
@@ -446,10 +427,6 @@
446427
ProductGroup = D85B82921AB6D5CE003F4FE2 /* Products */;
447428
ProjectRef = D85B82911AB6D5CE003F4FE2 /* RCTVibration.xcodeproj */;
448429
},
449-
{
450-
ProductGroup = 00D2770F1AB8C2C700DC1E48 /* Products */;
451-
ProjectRef = 00D2770E1AB8C2C700DC1E48 /* RCTWebSocketDebugger.xcodeproj */;
452-
},
453430
{
454431
ProductGroup = 14AADF001AC3DB95002390C9 /* Products */;
455432
ProjectRef = 14AADEFF1AC3DB95002390C9 /* React.xcodeproj */;
@@ -464,13 +441,6 @@
464441
/* End PBXProject section */
465442

466443
/* Begin PBXReferenceProxy section */
467-
00D277131AB8C2C700DC1E48 /* libRCTWebSocketDebugger.a */ = {
468-
isa = PBXReferenceProxy;
469-
fileType = archive.ar;
470-
path = libRCTWebSocketDebugger.a;
471-
remoteRef = 00D277121AB8C2C700DC1E48 /* PBXContainerItemProxy */;
472-
sourceTree = BUILT_PRODUCTS_DIR;
473-
};
474444
13417FE81AA91428003F314A /* libRCTImage.a */ = {
475445
isa = PBXReferenceProxy;
476446
fileType = archive.ar;

‎Examples/UIExplorer/UIExplorer/Images.xcassets/AppIcon.appiconset/Contents.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,42 +3,42 @@
33
{
44
"size" : "29x29",
55
"idiom" : "iphone",
6-
"filename" : "uie_icon@2x.png",
6+
"filename" : "Icon-Small@2x.png",
77
"scale" : "2x"
88
},
99
{
1010
"size" : "29x29",
1111
"idiom" : "iphone",
12-
"filename" : "uie_icon@2x-1.png",
12+
"filename" : "Icon-Small@3x.png",
1313
"scale" : "3x"
1414
},
1515
{
1616
"size" : "40x40",
1717
"idiom" : "iphone",
18-
"filename" : "uie_icon@2x-2.png",
18+
"filename" : "Icon-40@2x.png",
1919
"scale" : "2x"
2020
},
2121
{
2222
"size" : "40x40",
2323
"idiom" : "iphone",
24-
"filename" : "uie_icon@2x-3.png",
24+
"filename" : "Icon-40@3x.png",
2525
"scale" : "3x"
2626
},
2727
{
2828
"size" : "60x60",
2929
"idiom" : "iphone",
30-
"filename" : "uie_icon@2x-5.png",
30+
"filename" : "Icon-60@2x.png",
3131
"scale" : "2x"
3232
},
3333
{
3434
"size" : "60x60",
3535
"idiom" : "iphone",
36-
"filename" : "uie_icon@2x-4.png",
36+
"filename" : "Icon-60@3x.png",
3737
"scale" : "3x"
3838
}
3939
],
4040
"info" : {
4141
"version" : 1,
4242
"author" : "xcode"
4343
}
44-
}
44+
}

‎Examples/UIExplorer/UIExplorer/Images.xcassets/AppIcon.appiconset/Icon-40@2x.png‎

10.4 KB
Loading

0 commit comments

Comments
 (0)