Merge pull request #22 from zedtux/bugs/fix-library-bugs

Fixes all library issues
redbaron76 · Jul 8, 2018 · 1e6844f · 1e6844f
2 parents 3655e15 + b962cb7
commit 1e6844f
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 10 deletions.
diff --git a/components/button.js b/components/button.js
@@ -1,4 +1,5 @@
-import React, {Component, PropTypes} from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import {Text, TouchableOpacity, View} from 'react-native';
 import Navbar from './navbar';
 import styles, { theme } from '../styles';
@@ -213,4 +214,4 @@ export default class Button extends Component {
             PropTypes.string
         ]),
     };
-};
+};
diff --git a/components/container.js b/components/container.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import { ListView, ScrollView, View, Text, Dimensions } from 'react-native';
 import { KeyboardAwareScrollView } from 'react-native-keyboard-aware-scroll-view';
 import Spinner from 'react-native-spinkit';
@@ -216,4 +217,4 @@ Container.propTypes = {
     type: PropTypes.oneOf([SCROLL, LIST,PLAIN]),
     bgColor: PropTypes.string,
     height: PropTypes.number,
-};
+};
diff --git a/components/icon.js b/components/icon.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 
 import Ionicons from 'react-native-vector-icons/Ionicons';
 import Entypo from 'react-native-vector-icons/Entypo';

diff --git a/components/navbar.js b/components/navbar.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import { Image, Text, View, Platform, StatusBar } from 'react-native';
 
 import Icon from './icon';
@@ -372,7 +373,7 @@ export default class Navbar extends Component {
         badge: PropTypes.oneOfType([
             PropTypes.number,
             PropTypes.string,
-            PropTypes.shape(Navbar.badgeShape)
+            PropTypes.shape(this.badgeShape)
         ]),
         onPress: PropTypes.func,
         disabled: PropTypes.bool,

diff --git a/package.json b/package.json
@@ -16,9 +16,10 @@
     "navbar"
   ],
   "dependencies": {
-    "react-native-keyboard-aware-scroll-view": "^0.2.1",
-    "react-native-vector-icons": "~4.0.0",
-    "react-native-spinkit": "~1.0.1"
+    "prop-types": "^15.6.2",
+    "react-native-keyboard-aware-scroll-view": "^0.6.0",
+    "react-native-vector-icons": "~4.6.0",
+    "react-native-spinkit": "~1.1.1"
   },
   "author": "Fabio Fumis <f.fumis@gmail.com> (https://github.com/redbaron76)",
   "license": "MIT"