summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authoranderklander <anderklander@gmail.com>2018-04-11 11:05:08 +0200
committerAndrej Mihajlov <and@mullvad.net>2018-04-16 12:01:12 +0200
commitcf7654cc7b3c139ac18d997da0957180c8070456 (patch)
treedcde5a1c5664d86e6a8f1d6d3d4a43258710a0c6
parent84280854f7dde02e917635d22d874b6e57bf1676 (diff)
downloadmullvadvpn-cf7654cc7b3c139ac18d997da0957180c8070456.tar.xz
mullvadvpn-cf7654cc7b3c139ac18d997da0957180c8070456.zip
Correct style handling in Img.android
-rw-r--r--app/components/Img.android.js6
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 }/>
);
}
}