Skip to content

Commit

Permalink
Merge pull request #87 from infinitered/0.25_syntax_change
Browse files Browse the repository at this point in the history
[ALL] 0.25 syntax change
  • Loading branch information
GantMan committed May 5, 2016
2 parents d540f06 + 9096de6 commit a04eea9
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 15 deletions.
3 changes: 2 additions & 1 deletion ignite-base/App/Components/ProgressiveImage.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
thumbnail='http://stockphotos.com/thumbnail1.jpg'
*/

import React, { Image, Animated, View } from 'react-native'
import React from 'react'
import { Image, Animated, View } from 'react-native'
// import { Images } from '../Themes'

export default class ProgressiveImage extends React.Component {
Expand Down
3 changes: 2 additions & 1 deletion ignite-base/App/Containers/AllComponentsScreen.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// An All Components Screen is a great way to dev and quick-test components
import React, { View, ScrollView, Text, TouchableOpacity, PropTypes } from 'react-native'
import React from 'react'
import { View, ScrollView, Text, TouchableOpacity, PropTypes } from 'react-native'
import { connect } from 'react-redux'
import styles from './Styles/AllComponentsScreenStyle'
import ProgressiveImage from '../Components/ProgressiveImage'
Expand Down
6 changes: 3 additions & 3 deletions ignite-base/App/Containers/LoginScreen.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, {
Component,
import React from 'react'
import {
PropTypes,
View,
Text,
Expand All @@ -18,7 +18,7 @@ import {Images, Metrics} from '../Themes'
// I18n
import I18n from '../I18n/I18n.js'

class LoginScreen extends Component {
class LoginScreen extends React.Component {

constructor (props) {
super(props)
Expand Down
4 changes: 2 additions & 2 deletions ignite-cli/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-native-ignite",
"version": "0.2.2",
"version": "0.2.3",
"description": "Create new react native files that fit the IR workflow",
"files": [
"index.js"
Expand Down Expand Up @@ -30,7 +30,7 @@
"dependencies": {
"colors": "^1.1.2",
"commander": "^2.9.0",
"generator-react-native-ignite": "^0.1.0",
"generator-react-native-ignite": "^0.2.0",
"ramda": "^0.20.0",
"shelljs": "^0.6.0",
"yeoman-generator": "^0.21.1",
Expand Down
3 changes: 2 additions & 1 deletion ignite-generator/component/templates/component.js.template
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
'use strict'

import React, { View, Text } from 'react-native'
import React from 'react'
import { View, Text } from 'react-native'
import styles from './Styles/<%= name %>Style'

export default class <%= name %> extends React.Component {
Expand Down
12 changes: 6 additions & 6 deletions ignite-generator/container/templates/container.js.template
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// An All Components Screen is a great way to dev and quick-test components
import React, { View, ScrollView, Text, PropTypes } from 'react-native'
import React from 'react'
import { ScrollView, Text, PropTypes } from 'react-native'
import { connect } from 'react-redux'
import Actions from '../Actions/Creators'
import Routes from '../Navigation/Routes'
Expand All @@ -10,10 +10,10 @@ import styles from './Styles/<%= name %>Style'

export default class <%= name %> extends React.Component {

constructor (props) {
super(props)
this.state = {}
}
// constructor (props) {
// super(props)
// this.state = {}
// }

static propTypes = {
navigator: PropTypes.object.isRequired
Expand Down
2 changes: 1 addition & 1 deletion ignite-generator/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "generator-react-native-ignite",
"version": "0.1.1",
"version": "0.2.0",
"description": "Create new react native files that fit the IR workflow",
"files": [
"app",
Expand Down

0 comments on commit a04eea9

Please sign in to comment.