Skip to content

Commit

Permalink
Merge pull request #51 from heroandtn3/master
Browse files Browse the repository at this point in the history
chore(): user ActivityIndicator for spinner
  • Loading branch information
scazzy authored Dec 20, 2016
2 parents 9f6172d + 0253228 commit 9b8d939
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
7 changes: 3 additions & 4 deletions GiftedListView.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ var {
View,
Text,
RefreshControl,
ActivityIndicator,
} = require('react-native');


Expand All @@ -28,8 +29,6 @@ function MergeRecursive(obj1, obj2) {
return obj1;
}

var GiftedSpinner = require('react-native-gifted-spinner');

var GiftedListView = React.createClass({

getDefaultProps() {
Expand Down Expand Up @@ -102,7 +101,7 @@ var GiftedListView = React.createClass({

return (
<View style={[this.defaultStyles.paginationView, this.props.customStyles.paginationView]}>
<GiftedSpinner />
<ActivityIndicator />
</View>
);
},
Expand Down Expand Up @@ -252,7 +251,7 @@ var GiftedListView = React.createClass({
if(this.props.distinctRows){
mergedRows = this.props.distinctRows(mergedRows);
}

this._updateRows(mergedRows, options);
},

Expand Down
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,5 @@
},
"homepage": "https://github.com/FaridSafi/react-native-gifted-listview#readme",
"dependencies": {
"react-native-gifted-spinner": "^0.0.4"
}
}

1 comment on commit 9b8d939

@xubuhang
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

but show other errors
qq20170221-234519 2x
@scazzy

Please sign in to comment.