From 1ba41c934f6a27e93efbe4bc3f4ae8e543ff077d Mon Sep 17 00:00:00 2001
From: Julia Friesel <julia.friesel@gmail.com>
Date: Fri, 31 Aug 2018 14:51:41 +0200
Subject: [PATCH] Use style arrays
---
components/cycle-day/cycle-day-overview.js | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/components/cycle-day/cycle-day-overview.js b/components/cycle-day/cycle-day-overview.js
index 2c6916f6..baccc503 100644
--- a/components/cycle-day/cycle-day-overview.js
+++ b/components/cycle-day/cycle-day-overview.js
@@ -187,24 +187,20 @@ class SymptomBox extends Component {
const d = this.props.data
const boxActive = d ? styles.symptomBoxActive : {}
const iconActive = d ? iconStyles.symptomBoxActive : {}
+ const iconStyle = Object.assign({}, iconStyles.symptomBox, iconActive, disabledStyle)
const textActive = d ? styles.symptomTextActive : {}
const disabledStyle = this.props.disabled ? styles.symptomInFuture : {}
- const symptomBoxStyle = Object.assign({}, styles.symptomBox, boxActive, disabledStyle)
- const iconStyle = Object.assign({}, iconStyles.symptomBox, iconActive, disabledStyle)
- const symptomDataBoxStyle = Object.assign({}, styles.symptomDataBox, disabledStyle)
- const textStyle = Object.assign({}, textActive, disabledStyle)
-
return (
<TouchableOpacity onPress={this.props.onPress} disabled={this.props.disabled}>
- <View style={symptomBoxStyle}>
+ <View style={[styles.symptomBox, boxActive, disabledStyle]}>
<Icon
name='thermometer'
{...iconStyle}
/>
- <Text style={textStyle}>{this.props.title}</Text>
+ <Text style={[textActive, disabledStyle]}>{this.props.title}</Text>
</View>
- <View style={symptomDataBoxStyle}>
+ <View style={[styles.symptomDataBox, disabledStyle]}>
<Text style={styles.symptomDataText}>{this.props.data}</Text>
</View>
</TouchableOpacity>
--
GitLab