Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CAB-6032] Upgrade Realm and all other necessary libraries to support #2

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions lib/Button.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import React, {Component} from "react";
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import {ActivityIndicator, View, Text, TouchableNativeFeedback, Platform, ViewPropTypes} from "react-native";
import { ActivityIndicator, View, Text, TouchableNativeFeedback, Platform, TextStyle } from 'react-native';
import { ViewPropTypes } from 'deprecated-react-native-prop-types';
import Ripple from './polyfill/Ripple';
import { TYPO, PRIMARY, THEME_NAME, PRIMARY_COLORS } from './config';
import { getColor, isCompatible } from './helpers';
Expand All @@ -21,9 +22,9 @@ export default class Button extends Component {
activityIndicatorColor: PropTypes.string,
raised: PropTypes.bool,
styles: PropTypes.shape({
button: ViewPropTypes.style,
button: ViewPropTypes.style,
disabled: ViewPropTypes.style,
text: Text.propTypes.style
text: PropTypes.shape(TextStyle)
}),
onPress: PropTypes.func,
onLongPress: PropTypes.func,
Expand All @@ -37,7 +38,7 @@ export default class Button extends Component {
raised: false,
activityIndicatorColor: 'black',
styles: {
disabled: {opacity: 0.5}
disabled: { opacity: 0.5 }
}
};

Expand Down
3 changes: 2 additions & 1 deletion lib/Card/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import React, {Component} from "react";
import PropTypes from 'prop-types';
import {View, TouchableNativeFeedback, ViewPropTypes} from "react-native";
import { View, TouchableNativeFeedback } from "react-native";
import { ViewPropTypes } from 'deprecated-react-native-prop-types';
import Ripple from '../polyfill/Ripple';
import { getColor, isCompatible } from '../helpers';

Expand Down
5 changes: 3 additions & 2 deletions lib/Divider.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import React, {Component} from "react";
import React, { Component } from "react";
import PropTypes from 'prop-types';
import {View, ViewPropTypes} from "react-native";
import { View } from "react-native";
import { ViewPropTypes } from 'deprecated-react-native-prop-types';
import { THEME_NAME } from './config';

export default class Divider extends Component {
Expand Down
2 changes: 1 addition & 1 deletion lib/Icon.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, {Component} from "react";
import PropTypes from 'prop-types';
import {View, ViewPropTypes} from "react-native";
import { ViewPropTypes } from 'deprecated-react-native-prop-types';
import { getColor } from './helpers';
import VectorIconComponent from './VectorIconComponent';

Expand Down
5 changes: 3 additions & 2 deletions lib/Toolbar.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import React, {Component} from "react";
import React, { Component } from "react";
import PropTypes from 'prop-types';
import {View, Text, ViewPropTypes} from "react-native";
import { View, Text } from "react-native";
import { ViewPropTypes } from 'deprecated-react-native-prop-types';
import { TYPO, PRIMARY, THEME_NAME, PRIMARY_COLORS } from './config';
import { getColor } from './helpers';
import Icon from './Icon';
Expand Down
4 changes: 2 additions & 2 deletions lib/polyfill/Ripple.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, {Component} from "react";
import PropTypes from 'prop-types';
import {View, Animated, TouchableOpacity, Platform, ViewPropTypes} from "react-native";

import {View, Animated, TouchableOpacity, Platform } from "react-native";
import { ViewPropTypes } from 'deprecated-react-native-prop-types';
import elevationPolyfill from './Elevation';

export default class Ripple extends Component {
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@
},
"dependencies": {
"react-native-material-design-styles": "git+https://github.com/react-native-material-design/react-native-material-design-styles.git",
"react-native-vector-icons": "^4.4.2"
"react-native-vector-icons": "^4.4.2",
"deprecated-react-native-prop-types": "2.3.0"
},
"description": "React Native Material Design Components",
"devDependencies": {
Expand Down