lori/drip
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changing the mood icon

Browse Source
This commit is contained in:
Sofiya Tepikin
2019-01-30 13:15:12 +03:00
parent 570d0dc608
commit fee13da2dc
3 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/chart/chart.js
+1 -1
View File
@@ -23,7 +23,7 @@ const symptomIcons = {
desire: <DripIcon size={16} name='drip-icon-desire' color={styles.iconShades.desire[2]}/>, desire: <DripIcon size={16} name='drip-icon-desire' color={styles.iconShades.desire[2]}/>,
sex: <DripIcon size={16} name='drip-icon-sex' color={styles.iconShades.sex[2]}/>, sex: <DripIcon size={16} name='drip-icon-sex' color={styles.iconShades.sex[2]}/>,
pain: <DripIcon size={16} name='drip-icon-pain' color={styles.iconShades.pain[0]}/>, pain: <DripIcon size={16} name='drip-icon-pain' color={styles.iconShades.pain[0]}/>,
mood: <DripHomeIcon size={16} name='circle' color={styles.iconShades.mood[0]}/>, mood: <DripIcon size={16} name='drip-icon-mood' color={styles.iconShades.mood[0]}/>,
note: <DripIcon size={16} name='drip-icon-note' color={styles.iconShades.note[0]}/> note: <DripIcon size={16} name='drip-icon-note' color={styles.iconShades.note[0]}/>
} }
components/chart/styles.js
+2 -2
View File
@@ -77,8 +77,8 @@ const styles = {
'#9e346c', '#9e346c',
], ],
'pain': ['#bccd67'], 'pain': ['#bccd67'],
'mood': ['#BC6642'], 'mood': ['#bc6642'],
'note': ['#6CA299'] 'note': ['#6ca299']
}, },
yAxis: { yAxis: {
width: 27, width: 27,
components/cycle-day/cycle-day-overview.js
+5 -9
View File
@@ -13,7 +13,6 @@ import styles from '../../styles'
import * as labels from '../../i18n/en/cycle-day' import * as labels from '../../i18n/en/cycle-day'
import AppText from '../app-text' import AppText from '../app-text'
import DripIcon from '../../assets/drip-icons' import DripIcon from '../../assets/drip-icons'
import DripHomeIcon from '../../assets/drip-home-icons'
const bleedingLabels = labels.bleeding.labels const bleedingLabels = labels.bleeding.labels
const feelingLabels = labels.mucus.feeling.categories const feelingLabels = labels.mucus.feeling.categories
@@ -252,7 +251,7 @@ export default class CycleDayOverView extends Component {
onPress={() => this.navigate('MoodEditView')} onPress={() => this.navigate('MoodEditView')}
data={this.getLabel('mood')} data={this.getLabel('mood')}
disabled={dateInFuture} disabled={dateInFuture}
iconName='circle' iconName='drip-icon-mood'
> >
</SymptomBox> </SymptomBox>
<SymptomBox <SymptomBox
@@ -277,9 +276,9 @@ export default class CycleDayOverView extends Component {
class SymptomBox extends Component { class SymptomBox extends Component {
render() { render() {
const d = this.props.data const hasData = this.props.data
const boxActive = d ? styles.symptomBoxActive : {} const boxActive = hasData ? styles.symptomBoxActive : {}
const textActive = d ? styles.symptomTextActive : {} const textActive = hasData ? styles.symptomTextActive : {}
const disabledStyle = this.props.disabled ? styles.symptomInFuture : {} const disabledStyle = this.props.disabled ? styles.symptomInFuture : {}
return ( return (
@@ -288,10 +287,7 @@ class SymptomBox extends Component {
disabled={this.props.disabled} disabled={this.props.disabled}
> >
<View style={[styles.symptomBox, boxActive, disabledStyle]}> <View style={[styles.symptomBox, boxActive, disabledStyle]}>
{this.props.iconName == 'circle' <DripIcon name={this.props.iconName} size={50} color={hasData ? 'white' : 'black'}/>
? <DripHomeIcon name='circle' size={50} color={d ? 'white' : 'black'}/>
: <DripIcon name={this.props.iconName} size={50} color={d ? 'white' : 'black'}/>
}
<AppText style={[textActive, disabledStyle]}> <AppText style={[textActive, disabledStyle]}>
{this.props.title.toLowerCase()} {this.props.title.toLowerCase()}
</AppText> </AppText>