Commit 05874c5

committed

# Conflicts: # .gitignore # lib/webview.js # package.json

2 parents 385edd0 + 8864c4b commit 05874c5Copy full SHA for 05874c5

File tree

+66

-2

lines changed

+66

-2

lines changed

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`import React from 'react';`
`2`		`-import { View, StyleSheet,Text } from 'react-native';`
	`2`	`+import { View, StyleSheet } from 'react-native';`
`3`	`3`	`import WebView from 'react-native-webview';`
`4`	`4`	`import PropTypes from 'prop-types';`
`5`	`5`	`import LoadingBar from "./loading-bar";`
`@@ -13,7 +13,7 @@ export default class ProgressBarWebView extends React.PureComponent {`
`13`	`13`	`render() {`
`14`	`14`	`return (`
`15`	`15`	`<View style={styles.container}>`
`16`		`- <LoadingBar/>`
	`16`	`+ <LoadingBar/>`
`17`	`17`	`<WebView {...this.props} />`
`18`	`18`	`</View>`
`19`	`19`	`);`
`@@ -23,5 +23,6 @@ export default class ProgressBarWebView extends React.PureComponent {`
`23`	`23`	`const styles = StyleSheet.create({`
`24`	`24`	`container: {`
`25`	`25`	`flex: 1,`
	`26`	`+ position: 'relative',`
`26`	`27`	`},`
`27`	`28`	`});`

Lines changed: 63 additions & 0 deletions

Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Comments

(0)