-
Notifications
You must be signed in to change notification settings - Fork 24k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1576 from sahrens/Update_Tue_9_Jun
Update Tue June 9th
- Loading branch information
Showing
104 changed files
with
3,908 additions
and
1,351 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
360 changes: 301 additions & 59 deletions
360
Examples/UIExplorer/UIExplorer.xcodeproj/project.pbxproj
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,125 @@ | ||
| /** | ||
| * The examples provided by Facebook are for non-commercial testing and | ||
| * evaluation purposes only. | ||
| * | ||
| * Facebook reserves all rights not expressly granted. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS | ||
| * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL | ||
| * FACEBOOK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN | ||
| * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | ||
| * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| * | ||
| * @providesModule UIExplorerApp | ||
| * @flow | ||
| */ | ||
| 'use strict'; | ||
|
|
||
| var React = require('react-native'); | ||
| var Dimensions = require('Dimensions'); | ||
| var DrawerLayoutAndroid = require('DrawerLayoutAndroid'); | ||
| var ToolbarAndroid = require('ToolbarAndroid'); | ||
| var UIExplorerList = require('./UIExplorerList'); | ||
| var { | ||
| StyleSheet, | ||
| View, | ||
| } = React; | ||
|
|
||
| var DRAWER_WIDTH_LEFT = 56; | ||
|
|
||
| var UIExplorerApp = React.createClass({ | ||
|
|
||
| getInitialState: function() { | ||
| return { | ||
| example: { | ||
| title: 'UIExplorer', | ||
| component: this._renderHome(), | ||
| }, | ||
| }; | ||
| }, | ||
|
|
||
| render: function() { | ||
| return ( | ||
| <DrawerLayoutAndroid | ||
| drawerPosition={DrawerLayoutAndroid.positions.Left} | ||
| drawerWidth={Dimensions.get('window').width - DRAWER_WIDTH_LEFT} | ||
| ref={(drawer) => { this.drawer = drawer; }} | ||
| renderNavigationView={this._renderNavigationView}> | ||
| {this._renderNavigation()} | ||
| </DrawerLayoutAndroid> | ||
| ); | ||
| }, | ||
|
|
||
| _renderNavigationView: function() { | ||
| return ( | ||
| <UIExplorerList | ||
| onSelectExample={this.onSelectExample} | ||
| isInDrawer={true} | ||
| /> | ||
| ); | ||
| }, | ||
|
|
||
| onSelectExample: function(example) { | ||
| this.drawer.closeDrawer(); | ||
| if (example.title === 'UIExplorer') { | ||
| example.component = this._renderHome(); | ||
| } | ||
| this.setState({ | ||
| example: { | ||
| title: example.title, | ||
| component: example.component, | ||
| }, | ||
| }); | ||
| }, | ||
|
|
||
| _renderHome: function() { | ||
| var onSelectExample = this.onSelectExample; | ||
| return React.createClass({ | ||
| render: function() { | ||
| return ( | ||
| <UIExplorerList | ||
| onSelectExample={onSelectExample} | ||
| isInDrawer={false} | ||
| /> | ||
| ); | ||
| } | ||
| }); | ||
| }, | ||
|
|
||
| _renderNavigation: function() { | ||
| var Component = this.state.example.component; | ||
| return ( | ||
| <View style={styles.container}> | ||
| <ToolbarAndroid | ||
| logo={require('image!launcher_icon')} | ||
| navIcon={require('image!ic_menu_black_24dp')} | ||
| onIconClicked={() => this.drawer.openDrawer()} | ||
| style={styles.toolbar} | ||
| title={this.state.example.title} | ||
| /> | ||
| <Component /> | ||
| </View> | ||
| ); | ||
| }, | ||
|
|
||
| }); | ||
|
|
||
| var styles = StyleSheet.create({ | ||
| messageText: { | ||
| fontSize: 17, | ||
| fontWeight: '500', | ||
| padding: 15, | ||
| marginTop: 50, | ||
| marginLeft: 15, | ||
| }, | ||
| container: { | ||
| flex: 1, | ||
| }, | ||
| toolbar: { | ||
| backgroundColor: '#E9EAED', | ||
| height: 56, | ||
| }, | ||
| }); | ||
|
|
||
| module.exports = UIExplorerApp; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
50 changes: 50 additions & 0 deletions
50
Examples/UIExplorer/UIExplorerIntegrationTests/js/PromiseTest.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| /** | ||
| * Copyright (c) 2015-present, Facebook, Inc. | ||
| * All rights reserved. | ||
| * | ||
| * This source code is licensed under the BSD-style license found in the | ||
| * LICENSE file in the root directory of this source tree. An additional grant | ||
| * of patent rights can be found in the PATENTS file in the same directory. | ||
| * | ||
| * @providesModule PromiseTest | ||
| */ | ||
| 'use strict'; | ||
|
|
||
| var RCTTestModule = require('NativeModules').TestModule; | ||
| var React = require('react-native'); | ||
|
|
||
| var PromiseTest = React.createClass({ | ||
|
|
||
| shouldResolve: false, | ||
| shouldReject: false, | ||
|
|
||
| componentDidMount() { | ||
| Promise.all([ | ||
| this.testShouldResolve(), | ||
| this.testShouldReject(), | ||
| ]).then(() => RCTTestModule.finish( | ||
| this.shouldResolve && this.shouldReject | ||
| )); | ||
| }, | ||
|
|
||
| testShouldResolve() { | ||
| return RCTTestModule | ||
| .shouldResolve() | ||
| .then(() => this.shouldResolve = true) | ||
| .catch(() => this.shouldResolve = false); | ||
| }, | ||
|
|
||
| testShouldReject() { | ||
| return RCTTestModule | ||
| .shouldReject() | ||
| .then(() => this.shouldReject = false) | ||
| .catch(() => this.shouldReject = true); | ||
| }, | ||
|
|
||
| render() { | ||
| return <React.View />; | ||
| } | ||
|
|
||
| }); | ||
|
|
||
| module.exports = PromiseTest; |
File renamed without changes.
File renamed without changes.
Oops, something went wrong.