Commit d6269bb

committed

Merge branch 'master' into 0.7.0-rc

# Conflicts: # index.js

2 parents a694560 + 1c5c161 commit d6269bbCopy full SHA for d6269bb

File tree

+11

-20

lines changed

+11

-20

lines changed

Lines changed: 0 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -128,15 +128,6 @@ class Router extends React.Component {`
`128`	`128`	`});`
`129`	`129`	`}`
`130`	`130`
`131`		`- onWillFocus(route) {`
`132`		`- this.setState({ route });`
`133`		`- this.emitter.emit('willFocus', route.name);`
`134`		`- }`
`135`		`-`
`136`		`- onDidFocus(route) {`
`137`		`- this.emitter.emit('didFocus', route.name);`
`138`		`- }`
`139`		`-`
`140`	`131`	`onBack(navigator) {`
`141`	`132`	`if (this.state.route.index > 0) {`
`142`	`133`	`navigator.pop();`

Lines changed: 11 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,20 +13,20 @@ class TweetBig extends React.Component {`
`13`	`13`
`14`	`14`	`return (`
`15`	`15`	`<ScrollView>`
`16`		`- <View style={this.styles.tweetContainer}>`
`17`		`- <View style={this.styles.userContainer}>`
`18`		`- <Image source={{ uri: user.avatar }} style={this.styles.avatar} />`
`19`		`- <View style={this.styles.rightContainer}>`
`20`		`- <Text style={this.styles.name}>{user.name}</Text>`
`21`		`- <Text style={this.styles.username}>@{user.username}</Text>`
	`16`	`+ <View style={styles.tweetContainer}>`
	`17`	`+ <View style={styles.userContainer}>`
	`18`	`+ <Image source={{ uri: user.avatar }} style={styles.avatar} />`
	`19`	`+ <View style={styles.rightContainer}>`
	`20`	`+ <Text style={styles.name}>{user.name}</Text>`
	`21`	`+ <Text style={styles.username}>@{user.username}</Text>`
`22`	`22`	`</View>`
`23`	`23`	`</View>`
`24`		`- <View style={this.styles.textContainer}>`
`25`		`- <Text style={this.styles.text}>{text}</Text>`
	`24`	`+ <View style={styles.textContainer}>`
	`25`	`+ <Text style={styles.text}>{text}</Text>`
`26`	`26`	`</View>`
`27`		`- <View style={this.styles.retweetContainer}>`
`28`		`- <Text style={this.styles.rtBold}>1</Text>`
`29`		`- <Text style={this.styles.rtText}>RETWEET</Text>`
	`27`	`+ <View style={styles.retweetContainer}>`
	`28`	`+ <Text style={styles.rtBold}>1</Text>`
	`29`	`+ <Text style={styles.rtText}>RETWEET</Text>`
`30`	`30`	`</View>`
`31`	`31`	`</View>`
`32`	`32`	`</ScrollView>`

Comments

(0)