Skip to content

Commit 9bcb6dc

charpeni charpeni

committed

Merge pull request #124 from johannhof/master

Require React API from the react package

2 parents f5c55fd + b988bb3 commit 9bcb6dcCopy full SHA for 9bcb6dc

File tree

23 files changed

+69

-24

lines changed

components
examples
- Explorer
  - Page.js
  - components
    - LeftCorner.js
    - RightCorner.js
  - index.android.js
  - index.ios.js
- twitter-example
  - components
  - index.js
  - pages
index.js
package.json

23 files changed

+69

-24

lines changed

`‎components/NavBarContainer.js`

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,11 @@`
`1`		`-import React, { StyleSheet, View, PropTypes, Platform, BackAndroid, Text } from 'react-native';`
	`1`	`+import React, {PropTypes} from "react";`
	`2`	`+import{`
	`3`	`+ StyleSheet,`
	`4`	`+ View,`
	`5`	`+ Platform,`
	`6`	`+ BackAndroid,`
	`7`	`+ Text`
	`8`	`+} from 'react-native';`
`2`	`9`
`3`	`10`	`import NavBarContent from './NavBarContent';`
`4`	`11`	`import * as Styles from '../styles';`

`‎components/NavBarContent.js`

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,12 @@`
`1`		`-import React, { StyleSheet, Text, View, Animated, Easing, PropTypes, Platform } from 'react-native';`
	`1`	`+import React, {PropTypes} from "react";`
	`2`	`+import {`
	`3`	`+ StyleSheet,`
	`4`	`+ Text,`
	`5`	`+ View,`
	`6`	`+ Animated,`
	`7`	`+ Easing,`
	`8`	`+ Platform`
	`9`	`+} from 'react-native';`
`2`	`10`	`import NavButton from './NavButton';`
`3`	`11`	`import * as Styles from '../styles';`
`4`	`12`

`‎components/NavButton.js`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,10 @@`
`1`		`-import React, { StyleSheet, Text, View, TouchableHighlight, PropTypes } from 'react-native';`
	`1`	`+import React, {PropTypes} from "react";`
	`2`	`+import {`
	`3`	`+ StyleSheet,`
	`4`	`+ Text,`
	`5`	`+ View,`
	`6`	`+ TouchableHighlight`
	`7`	`+} from 'react-native';`
`2`	`8`
`3`	`9`	`const propTypes = {`
`4`	`10`	`backButtonComponent: PropTypes.func,`

`‎examples/Explorer/Page.js`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`		`-import React, {`
	`1`	`+import React from "react";`
	`2`	`+import {`
`2`	`3`	`StyleSheet,`
`3`	`4`	`Text,`
`4`	`5`	`View,`

`‎examples/Explorer/components/LeftCorner.js`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`		`-import React, {`
	`1`	`+import React, {PropTypes} from "react";`
	`2`	`+import {`
`2`	`3`	`StyleSheet,`
`3`	`4`	`View,`
`4`	`5`	`TouchableHighlight,`
`5`	`6`	`Image,`
`6`		`- PropTypes,`
`7`	`7`	`} from 'react-native';`
`8`	`8`
`9`	`9`	`const propTypes = {`

`‎examples/Explorer/components/RightCorner.js`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`		`-import React, {`
	`1`	`+import React from "react";`
	`2`	`+import {`
`2`	`3`	`StyleSheet,`
`3`	`4`	`View,`
`4`	`5`	`TouchableHighlight,`

`‎examples/Explorer/index.android.js`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`		`-import React, {`
	`1`	`+import React, {PropTypes} from "react";`
	`2`	`+import {`
`2`	`3`	`AppRegistry,`
`3`	`4`	`StyleSheet,`
`4`	`5`	`} from 'react-native';`

`‎examples/Explorer/index.ios.js`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`		`-import React, {`
	`1`	`+import React, {PropTypes} from "react";`
	`2`	`+import {`
`2`	`3`	`AppRegistry,`
`3`	`4`	`StyleSheet,`
`4`	`5`	`} from 'react-native';`

`‎examples/twitter-example/components/BackButton.js`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`		`-import React, { StyleSheet, Image } from 'react-native';`
	`1`	`+import React from "react";`
	`2`	`+import { StyleSheet, Image } from 'react-native';`
`2`	`3`
`3`	`4`	`export default class BackButton extends React.Component {`
`4`	`5`	`render() {`

`‎examples/twitter-example/components/RightCorner.js`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`		`-import React, { StyleSheet, View } from 'react-native';`
	`1`	`+import React from "react";`
	`2`	`+import { StyleSheet, View } from 'react-native';`
`2`	`3`
`3`	`4`	`export default class RightCorner extends React.Component {`
`4`	`5`	`render() {`

0 commit comments

Comments

(0)