diff options
| author | Andrej Mihajlov <and@mullvad.net> | 2018-04-16 12:01:39 +0200 |
|---|---|---|
| committer | Andrej Mihajlov <and@mullvad.net> | 2018-04-16 12:01:39 +0200 |
| commit | c92ea97d9180fe05ab1adb35a4af0bcb19b12ec9 (patch) | |
| tree | ddd20a989d7c5b0fc9cae12724970d69976f889c /app/components/Img.android.js | |
| parent | c9f2ec62790a62e674b1252a6a18dec451d17bf3 (diff) | |
| parent | 898dd74e5ac86dac2638dc26975b22a9fb0392d4 (diff) | |
| download | mullvadvpn-c92ea97d9180fe05ab1adb35a4af0bcb19b12ec9.tar.xz mullvadvpn-c92ea97d9180fe05ab1adb35a4af0bcb19b12ec9.zip | |
Merge branch 'rn-compatibility'
Diffstat (limited to 'app/components/Img.android.js')
| -rw-r--r-- | app/components/Img.android.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/components/Img.android.js b/app/components/Img.android.js index ced9d3f461..c1deb53bf7 100644 --- a/app/components/Img.android.js +++ b/app/components/Img.android.js @@ -1,7 +1,7 @@ // @flow import React, { Component } from 'react'; import { StyleSheet } from 'react-native'; -import { Image } from 'reactxp'; +import { Image, Styles } from 'reactxp'; export default class Img extends Component { props: { @@ -21,11 +21,11 @@ export default class Img extends Component { if (tintColor === 'currentColor' && this.props.style) { const { color: tint, ...otherStyles } = StyleSheet.flatten(this.props.style); return( - <Image style={[ otherStyles, { tintColor: tint, height: height, width: width } ]} source={ source }/> + <Image style={Styles.createViewStyle({ ...otherStyles, tintColor: tint, height: height, width: width }, false)} source={ source }/> ); } else { return( - <Image style={[ this.props.style, { height: height, width: width } ]} source={ source }/> + <Image style={Styles.createViewStyle({ ...this.props.style, height: height, width: width }, false)} source={ source }/> ); } } |
