Skip to content

Commit 480c9bc

Browse files
author
aksonov
committed
update Example to RN0.50.1
1 parent bd8f1f3 commit 480c9bc

File tree

8 files changed

+807
-352
lines changed

8 files changed

+807
-352
lines changed

‎Example/components/CustomNavBarView.js‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
import React from 'react';
2-
import {PropTypes} from "react";
3-
import {StyleSheet, Text, View, ViewPropTypes} from "react-native";
2+
import PropTypes from 'prop-types';
3+
import {StyleSheet, Text, View, ViewPropTypes} from 'react-native';
44
import Button from 'react-native-button';
55
import { Actions } from 'react-native-router-flux';
66

7-
const contextTypes = {
8-
drawer: React.PropTypes.object,
9-
};
10-
117
const propTypes = {
128
name: PropTypes.string,
139
sceneStyle: ViewPropTypes.style,
@@ -39,7 +35,6 @@ class TabView extends React.Component {
3935
);
4036
}
4137
}
42-
TabView.contextTypes = contextTypes;
4338
TabView.propTypes = propTypes;
4439

4540
export default TabView;

‎Example/components/Login2.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export default class extends React.Component {
2121
<Text>Login page 2</Text>
2222
<Text>Title: {title}</Text>
2323
<Text>Data: {data}</Text>
24-
<Button onPress={() => { Actions.pop(); Actions.refresh({ data: 'Data after pop', title: 'title after pop' }); }}>Back and refresh</Button>
24+
<Button onPress={() => { Actions.pop({ refresh: { data: 'Data after pop', title: 'title after pop' } }); }}>Back and refresh</Button>
2525
<Button onPress={() => Actions.loginModal3({ data:"Custom data3", title:"Custom title3" })}>Login 3</Button>
2626
</View>
2727
);

‎Example/components/TabIcon.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
import React, {
2-
PropTypes,
3-
} from 'react';
1+
import React from 'react';
2+
import PropTypes from 'prop-types';
43
import {
54
Text,
65
} from 'react-native';

‎Example/components/TabView.js‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
import React from 'react';
2-
import { PropTypes } from "react";
2+
import PropTypes from 'prop-types';
33
import { StyleSheet, Text, View, ViewPropTypes } from "react-native";
44
import Button from 'react-native-button';
55
import { Actions } from 'react-native-router-flux';
66

7-
const contextTypes = {
8-
drawer: React.PropTypes.object,
9-
};
10-
117
const propTypes = {
128
name: PropTypes.string,
139
sceneStyle: ViewPropTypes.style,
@@ -48,7 +44,6 @@ class TabView extends React.Component {
4844
);
4945
}
5046
}
51-
TabView.contextTypes = contextTypes;
5247
TabView.propTypes = propTypes;
5348

5449
export default TabView;

‎Example/components/drawer/DrawerContent.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class DrawerContent extends React.Component {
2323
}
2424

2525
static contextTypes = {
26-
drawer: React.PropTypes.object,
26+
drawer: PropTypes.object,
2727
}
2828

2929
render() {

‎Example/ios/Example.xcodeproj/project.pbxproj‎

Lines changed: 126 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
2D02E4BC1E0B4A80006451C7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; };
2626
2D02E4BD1E0B4A84006451C7 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
2727
2D02E4BF1E0B4AB3006451C7 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
28-
2D02E4C21E0B4AEC006451C7 /* libRCTAnimation-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E9157351DD0AC6500FF2AA8 /* libRCTAnimation-tvOS.a */; };
28+
2D02E4C21E0B4AEC006451C7 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E9157351DD0AC6500FF2AA8 /* libRCTAnimation.a */; };
2929
2D02E4C31E0B4AEC006451C7 /* libRCTImage-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DAD3E841DF850E9000B6D8A /* libRCTImage-tvOS.a */; };
3030
2D02E4C41E0B4AEC006451C7 /* libRCTLinking-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DAD3E881DF850E9000B6D8A /* libRCTLinking-tvOS.a */; };
3131
2D02E4C51E0B4AEC006451C7 /* libRCTNetwork-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DAD3E8C1DF850E9000B6D8A /* libRCTNetwork-tvOS.a */; };
@@ -228,6 +228,62 @@
228228
remoteGlobalIDString = 58B5119B1A9E6C1200147676;
229229
remoteInfo = RCTText;
230230
};
231+
876122331FB1C9800093BB20 /* PBXContainerItemProxy */ = {
232+
isa = PBXContainerItemProxy;
233+
containerPortal = 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */;
234+
proxyType = 2;
235+
remoteGlobalIDString = 3DBE0D001F3B181A0099AA32;
236+
remoteInfo = fishhook;
237+
};
238+
876122351FB1C9800093BB20 /* PBXContainerItemProxy */ = {
239+
isa = PBXContainerItemProxy;
240+
containerPortal = 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */;
241+
proxyType = 2;
242+
remoteGlobalIDString = 3DBE0D0D1F3B181C0099AA32;
243+
remoteInfo = "fishhook-tvOS";
244+
};
245+
876122451FB1C9800093BB20 /* PBXContainerItemProxy */ = {
246+
isa = PBXContainerItemProxy;
247+
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
248+
proxyType = 2;
249+
remoteGlobalIDString = 139D7ECE1E25DB7D00323FB7;
250+
remoteInfo = "third-party";
251+
};
252+
876122471FB1C9800093BB20 /* PBXContainerItemProxy */ = {
253+
isa = PBXContainerItemProxy;
254+
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
255+
proxyType = 2;
256+
remoteGlobalIDString = 3D383D3C1EBD27B6005632C8;
257+
remoteInfo = "third-party-tvOS";
258+
};
259+
876122491FB1C9800093BB20 /* PBXContainerItemProxy */ = {
260+
isa = PBXContainerItemProxy;
261+
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
262+
proxyType = 2;
263+
remoteGlobalIDString = 139D7E881E25C6D100323FB7;
264+
remoteInfo = "double-conversion";
265+
};
266+
8761224B1FB1C9800093BB20 /* PBXContainerItemProxy */ = {
267+
isa = PBXContainerItemProxy;
268+
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
269+
proxyType = 2;
270+
remoteGlobalIDString = 3D383D621EBD27B9005632C8;
271+
remoteInfo = "double-conversion-tvOS";
272+
};
273+
8761224D1FB1C9800093BB20 /* PBXContainerItemProxy */ = {
274+
isa = PBXContainerItemProxy;
275+
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
276+
proxyType = 2;
277+
remoteGlobalIDString = 9936F3131F5F2E4B0010BF04;
278+
remoteInfo = privatedata;
279+
};
280+
8761224F1FB1C9800093BB20 /* PBXContainerItemProxy */ = {
281+
isa = PBXContainerItemProxy;
282+
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
283+
proxyType = 2;
284+
remoteGlobalIDString = 9936F32F1F5F2E5B0010BF04;
285+
remoteInfo = "privatedata-tvOS";
286+
};
231287
/* End PBXContainerItemProxy section */
232288

233289
/* Begin PBXFileReference section */
@@ -289,7 +345,7 @@
289345
buildActionMask = 2147483647;
290346
files = (
291347
2D02E4C91E0B4AEC006451C7 /* libReact.a in Frameworks */,
292-
2D02E4C21E0B4AEC006451C7 /* libRCTAnimation-tvOS.a in Frameworks */,
348+
2D02E4C21E0B4AEC006451C7 /* libRCTAnimation.a in Frameworks */,
293349
2D02E4C31E0B4AEC006451C7 /* libRCTImage-tvOS.a in Frameworks */,
294350
2D02E4C41E0B4AEC006451C7 /* libRCTLinking-tvOS.a in Frameworks */,
295351
2D02E4C51E0B4AEC006451C7 /* libRCTNetwork-tvOS.a in Frameworks */,
@@ -382,6 +438,8 @@
382438
children = (
383439
139FDEF41B06529B00C62182 /* libRCTWebSocket.a */,
384440
3DAD3E991DF850E9000B6D8A /* libRCTWebSocket-tvOS.a */,
441+
876122341FB1C9800093BB20 /* libfishhook.a */,
442+
876122361FB1C9800093BB20 /* libfishhook-tvOS.a */,
385443
);
386444
name = Products;
387445
sourceTree = "<group>";
@@ -411,6 +469,12 @@
411469
3DAD3EAB1DF850E9000B6D8A /* libcxxreact.a */,
412470
3DAD3EAD1DF850E9000B6D8A /* libjschelpers.a */,
413471
3DAD3EAF1DF850E9000B6D8A /* libjschelpers.a */,
472+
876122461FB1C9800093BB20 /* libthird-party.a */,
473+
876122481FB1C9800093BB20 /* libthird-party.a */,
474+
8761224A1FB1C9800093BB20 /* libdouble-conversion.a */,
475+
8761224C1FB1C9800093BB20 /* libdouble-conversion.a */,
476+
8761224E1FB1C9800093BB20 /* libprivatedata.a */,
477+
876122501FB1C9800093BB20 /* libprivatedata-tvOS.a */,
414478
);
415479
name = Products;
416480
sourceTree = "<group>";
@@ -419,7 +483,7 @@
419483
isa = PBXGroup;
420484
children = (
421485
5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */,
422-
5E9157351DD0AC6500FF2AA8 /* libRCTAnimation-tvOS.a */,
486+
5E9157351DD0AC6500FF2AA8 /* libRCTAnimation.a */,
423487
);
424488
name = Products;
425489
sourceTree = "<group>";
@@ -804,10 +868,10 @@
804868
remoteRef = 5E9157321DD0AC6500FF2AA8 /* PBXContainerItemProxy */;
805869
sourceTree = BUILT_PRODUCTS_DIR;
806870
};
807-
5E9157351DD0AC6500FF2AA8 /* libRCTAnimation-tvOS.a */ = {
871+
5E9157351DD0AC6500FF2AA8 /* libRCTAnimation.a */ = {
808872
isa = PBXReferenceProxy;
809873
fileType = archive.ar;
810-
path = "libRCTAnimation-tvOS.a";
874+
path = libRCTAnimation.a;
811875
remoteRef = 5E9157341DD0AC6500FF2AA8 /* PBXContainerItemProxy */;
812876
sourceTree = BUILT_PRODUCTS_DIR;
813877
};
@@ -825,6 +889,62 @@
825889
remoteRef = 832341B41AAA6A8300B99B32 /* PBXContainerItemProxy */;
826890
sourceTree = BUILT_PRODUCTS_DIR;
827891
};
892+
876122341FB1C9800093BB20 /* libfishhook.a */ = {
893+
isa = PBXReferenceProxy;
894+
fileType = archive.ar;
895+
path = libfishhook.a;
896+
remoteRef = 876122331FB1C9800093BB20 /* PBXContainerItemProxy */;
897+
sourceTree = BUILT_PRODUCTS_DIR;
898+
};
899+
876122361FB1C9800093BB20 /* libfishhook-tvOS.a */ = {
900+
isa = PBXReferenceProxy;
901+
fileType = archive.ar;
902+
path = "libfishhook-tvOS.a";
903+
remoteRef = 876122351FB1C9800093BB20 /* PBXContainerItemProxy */;
904+
sourceTree = BUILT_PRODUCTS_DIR;
905+
};
906+
876122461FB1C9800093BB20 /* libthird-party.a */ = {
907+
isa = PBXReferenceProxy;
908+
fileType = archive.ar;
909+
path = "libthird-party.a";
910+
remoteRef = 876122451FB1C9800093BB20 /* PBXContainerItemProxy */;
911+
sourceTree = BUILT_PRODUCTS_DIR;
912+
};
913+
876122481FB1C9800093BB20 /* libthird-party.a */ = {
914+
isa = PBXReferenceProxy;
915+
fileType = archive.ar;
916+
path = "libthird-party.a";
917+
remoteRef = 876122471FB1C9800093BB20 /* PBXContainerItemProxy */;
918+
sourceTree = BUILT_PRODUCTS_DIR;
919+
};
920+
8761224A1FB1C9800093BB20 /* libdouble-conversion.a */ = {
921+
isa = PBXReferenceProxy;
922+
fileType = archive.ar;
923+
path = "libdouble-conversion.a";
924+
remoteRef = 876122491FB1C9800093BB20 /* PBXContainerItemProxy */;
925+
sourceTree = BUILT_PRODUCTS_DIR;
926+
};
927+
8761224C1FB1C9800093BB20 /* libdouble-conversion.a */ = {
928+
isa = PBXReferenceProxy;
929+
fileType = archive.ar;
930+
path = "libdouble-conversion.a";
931+
remoteRef = 8761224B1FB1C9800093BB20 /* PBXContainerItemProxy */;
932+
sourceTree = BUILT_PRODUCTS_DIR;
933+
};
934+
8761224E1FB1C9800093BB20 /* libprivatedata.a */ = {
935+
isa = PBXReferenceProxy;
936+
fileType = archive.ar;
937+
path = libprivatedata.a;
938+
remoteRef = 8761224D1FB1C9800093BB20 /* PBXContainerItemProxy */;
939+
sourceTree = BUILT_PRODUCTS_DIR;
940+
};
941+
876122501FB1C9800093BB20 /* libprivatedata-tvOS.a */ = {
942+
isa = PBXReferenceProxy;
943+
fileType = archive.ar;
944+
path = "libprivatedata-tvOS.a";
945+
remoteRef = 8761224F1FB1C9800093BB20 /* PBXContainerItemProxy */;
946+
sourceTree = BUILT_PRODUCTS_DIR;
947+
};
828948
/* End PBXReferenceProxy section */
829949

830950
/* Begin PBXResourcesBuildPhase section */
@@ -874,7 +994,7 @@
874994
);
875995
runOnlyForDeploymentPostprocessing = 0;
876996
shellPath = /bin/sh;
877-
shellScript = "export NODE_BINARY=node\n../node_modules/react-native/packager/react-native-xcode.sh";
997+
shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh";
878998
};
879999
2D02E4CB1E0B4B27006451C7 /* Bundle React Native Code And Images */ = {
8801000
isa = PBXShellScriptBuildPhase;

‎Example/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
"mobx": "^3.2.1",
1313
"mobx-react": "^4.2.1",
1414
"prop-types": "^15.5.10",
15-
"react": "16.0.0-alpha.6",
16-
"react-native": "0.44.0",
15+
"react": "16.0.0",
16+
"react-native": "0.50.1",
1717
"react-native-button": "^2.0.0",
1818
"react-native-message-bar": "^1.6.0",
1919
"react-native-router-flux": "file:../",
20-
"react-navigation": "1.0.0-beta.13"
20+
"react-navigation": "1.0.0-beta.17"
2121
},
2222
"devDependencies": {
2323
"babel-jest": "20.0.3",

0 commit comments

Comments
 (0)