Skip to content

Commit ead3a74

Browse files
committed
Second Update from Tue 24 Mar
1 parent 8068c65 commit ead3a74

121 files changed

Lines changed: 6806 additions & 665 deletions

File tree

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 & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
[libs]
2323
Libraries/react-native/react-native-interface.js
24+
Examples/UIExplorer/ImageMocks.js
2425

2526
[options]
2627
module.system=haste

Examples/2048/2048.xcodeproj/project.pbxproj

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

99
/* Begin PBXBuildFile section */
10+
13ACB6741AC2117000FF4204 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 13ACB6711AC2113600FF4204 /* libRCTAnimation.a */; };
1011
13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; };
1112
13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB11A68108700A75B9A /* LaunchScreen.xib */; };
1213
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
@@ -16,6 +17,13 @@
1617
/* End PBXBuildFile section */
1718

1819
/* Begin PBXContainerItemProxy section */
20+
13ACB6701AC2113600FF4204 /* PBXContainerItemProxy */ = {
21+
isa = PBXContainerItemProxy;
22+
containerPortal = 13ACB66C1AC2113500FF4204 /* RCTAnimation.xcodeproj */;
23+
proxyType = 2;
24+
remoteGlobalIDString = 134814201AA4EA6300B7C361;
25+
remoteInfo = RCTAnimation;
26+
};
1927
832341B41AAA6A8300B99B32 /* PBXContainerItemProxy */ = {
2028
isa = PBXContainerItemProxy;
2129
containerPortal = 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */;
@@ -33,6 +41,7 @@
3341
/* End PBXContainerItemProxy section */
3442

3543
/* Begin PBXFileReference section */
44+
13ACB66C1AC2113500FF4204 /* RCTAnimation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAnimation.xcodeproj; path = ../../Libraries/Animation/RCTAnimation.xcodeproj; sourceTree = "<group>"; };
3645
13B07F961A680F5B00A75B9A /* 2048.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = 2048.app; sourceTree = BUILT_PRODUCTS_DIR; };
3746
13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = 2048/AppDelegate.h; sourceTree = "<group>"; };
3847
13B07FB01A68108700A75B9A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = 2048/AppDelegate.m; sourceTree = "<group>"; };
@@ -49,6 +58,7 @@
4958
isa = PBXFrameworksBuildPhase;
5059
buildActionMask = 2147483647;
5160
files = (
61+
13ACB6741AC2117000FF4204 /* libRCTAnimation.a in Frameworks */,
5262
8323482C1A77B59500B55238 /* libReactKit.a in Frameworks */,
5363
832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */,
5464
);
@@ -57,6 +67,14 @@
5767
/* End PBXFrameworksBuildPhase section */
5868

5969
/* Begin PBXGroup section */
70+
13ACB66D1AC2113500FF4204 /* Products */ = {
71+
isa = PBXGroup;
72+
children = (
73+
13ACB6711AC2113600FF4204 /* libRCTAnimation.a */,
74+
);
75+
name = Products;
76+
sourceTree = "<group>";
77+
};
6078
13B07FAE1A68108700A75B9A /* 2048 */ = {
6179
isa = PBXGroup;
6280
children = (
@@ -75,6 +93,7 @@
7593
children = (
7694
834D32361A76971A00F38302 /* ReactKit.xcodeproj */,
7795
832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */,
96+
13ACB66C1AC2113500FF4204 /* RCTAnimation.xcodeproj */,
7897
);
7998
name = Libraries;
8099
sourceTree = "<group>";
@@ -153,6 +172,10 @@
153172
productRefGroup = 83CBBA001A601CBA00E9B192 /* Products */;
154173
projectDirPath = "";
155174
projectReferences = (
175+
{
176+
ProductGroup = 13ACB66D1AC2113500FF4204 /* Products */;
177+
ProjectRef = 13ACB66C1AC2113500FF4204 /* RCTAnimation.xcodeproj */;
178+
},
156179
{
157180
ProductGroup = 832341B11AAA6A8300B99B32 /* Products */;
158181
ProjectRef = 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */;
@@ -170,6 +193,13 @@
170193
/* End PBXProject section */
171194

172195
/* Begin PBXReferenceProxy section */
196+
13ACB6711AC2113600FF4204 /* libRCTAnimation.a */ = {
197+
isa = PBXReferenceProxy;
198+
fileType = archive.ar;
199+
path = libRCTAnimation.a;
200+
remoteRef = 13ACB6701AC2113600FF4204 /* PBXContainerItemProxy */;
201+
sourceTree = BUILT_PRODUCTS_DIR;
202+
};
173203
832341B51AAA6A8300B99B32 /* libRCTText.a */ = {
174204
isa = PBXReferenceProxy;
175205
fileType = archive.ar;

Examples/Movies/SearchScreen.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ var {
1818
StyleSheet,
1919
Text,
2020
TextInput,
21-
TimerMixin,
2221
View,
2322
} = React;
23+
var TimerMixin = require('react-timer-mixin');
2424

2525
var MovieCell = require('./MovieCell');
2626
var MovieScreen = require('./MovieScreen');

Examples/UIExplorer/ActivityIndicatorExample.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ var React = require('react-native');
1414
var {
1515
ActivityIndicatorIOS,
1616
StyleSheet,
17-
TimerMixin,
1817
View,
1918
} = React;
19+
var TimerMixin = require('react-timer-mixin');
2020

2121
var ToggleAnimatingActivityIndicator = React.createClass({
2222
mixins: [TimerMixin],

Examples/UIExplorer/ImageCapInsetsExample.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 ImageCapInsetsExample
10+
* @flow
1011
*/
1112
'use strict';
1213

Examples/UIExplorer/ImageExample.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
* This source code is licensed under the BSD-style license found in the
66
* LICENSE file in the root directory of this source tree. An additional grant
77
* of patent rights can be found in the PATENTS file in the same directory.
8+
*
9+
* @flow
810
*/
911
'use strict';
1012

Examples/UIExplorer/ImageMocks.js

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
/**
2+
* Copyright 2004-present Facebook. All Rights Reserved.
3+
*
4+
* This source code is licensed under the BSD-style license found in the
5+
* LICENSE file in the root directory of this source tree. An additional grant
6+
* of patent rights can be found in the PATENTS file in the same directory.
7+
*
8+
* @flow
9+
*/
10+
'use strict';
11+
12+
declare module 'image!story-background' {
13+
declare var uri: string;
14+
declare var isStatic: boolean;
15+
}
16+
17+
declare module 'image!uie_comment_highlighted' {
18+
declare var uri: string;
19+
declare var isStatic: boolean;
20+
}
21+
22+
declare module 'image!uie_comment_normal' {
23+
declare var uri: string;
24+
declare var isStatic: boolean;
25+
}
26+
27+
declare module 'image!uie_thumb_normal' {
28+
declare var uri: string;
29+
declare var isStatic: boolean;
30+
}
31+
32+
declare module 'image!uie_thumb_selected' {
33+
declare var uri: string;
34+
declare var isStatic: boolean;
35+
}

0 commit comments

Comments
 (0)