Skip to content

Commit

Permalink
Merge pull request larsvinter#9 from nomuppets/master
Browse files Browse the repository at this point in the history
Component no longer comes from react native
  • Loading branch information
larsvinter committed Jun 7, 2016
2 parents 591ed41 + 2ba7060 commit 6e9dfa9
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 7 deletions.
9 changes: 6 additions & 3 deletions src/AwesomeButton.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
const React = require('react-native')
const ReactNative = require('react-native')
const React = require('react')

const {
Component
} = React

const {
Animated,
Component,
View,
Text,
StyleSheet,
TouchableOpacity
} = React
} = ReactNative

var ProgressBar = require('./ProgressBar');

Expand Down
10 changes: 6 additions & 4 deletions src/ProgressBar.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
'use strict';

var React = require('react-native');
var {
const ReactNative = require('react-native')
const React = require('react')

const {
Platform,
ActivityIndicatorIOS,
ProgressBarAndroid,
} = React;
ProgressBarAndroid
} = ReactNative

var ProgressBar = React.createClass({
render() {
Expand Down

0 comments on commit 6e9dfa9

Please sign in to comment.