Skip to content

Commit 4d3822a

Browse files
author
Justin McPherson
committed
Match master
1 parent 92d9147 commit 4d3822a

7 files changed

Lines changed: 6 additions & 4 deletions

File tree

‎Examples/UIExplorer/UIExplorerApp.ubuntu.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
*/
1717
'use strict';
1818

19-
const React = require('react-native');
19+
const React = require('react');
20+
const ReactNative = require('react-native');
2021
const UIExplorerActions = require('./UIExplorerActions');
2122
const UIExplorerList = require('./UIExplorerList.ubuntu');
2223
const UIExplorerExampleList = require('./UIExplorerExampleList');
@@ -28,7 +29,7 @@ const {
2829
NavigationExperimental,
2930
StyleSheet,
3031
View,
31-
} = React;
32+
} = ReactNative;
3233

3334
const {
3435
CardStack: NavigationCardStack,

‎Examples/UIExplorer/XHRExample.ubuntu.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,16 @@
1515
*/
1616
'use strict';
1717

18-
var React = require('react-native');
18+
var React = require('react');
19+
var ReactNative = require('react-native');
1920
var {
2021
PixelRatio,
2122
StyleSheet,
2223
Text,
2324
TextInput,
2425
TouchableHighlight,
2526
View,
26-
} = React;
27+
} = ReactNative;
2728

2829
// TODO t7093728 This is a simlified XHRExample.ios.js.
2930
// Once we have Camera roll, Toast, Intent (for opening URLs)

‎Libraries/CustomComponents/NavigationExperimental/assets/back-icon@1.5x.ubuntu.png‎

273 Bytes
Loading

‎Libraries/CustomComponents/NavigationExperimental/assets/back-icon@1x.ubuntu.png‎

177 Bytes
Loading

‎Libraries/CustomComponents/NavigationExperimental/assets/back-icon@2x.ubuntu.png‎

303 Bytes
Loading

‎Libraries/CustomComponents/NavigationExperimental/assets/back-icon@3x.ubuntu.png‎

439 Bytes
Loading

‎Libraries/CustomComponents/NavigationExperimental/assets/back-icon@4x.ubuntu.png‎

586 Bytes
Loading

0 commit comments

Comments
 (0)