diff --git a/assets/mucus.js b/assets/mucus.js new file mode 100644 index 0000000..ba12a35 --- /dev/null +++ b/assets/mucus.js @@ -0,0 +1,75 @@ +import React from 'react' +import { G, Path } from 'react-native-svg' + +export default function MucusIcon(props) { + return ( + + + + + + + + + + + + + + + + + + + + + + + + + + + + ) +} \ No newline at end of file diff --git a/components/cycle-day/cycle-day-overview.js b/components/cycle-day/cycle-day-overview.js index 14219f2..2639e14 100644 --- a/components/cycle-day/cycle-day-overview.js +++ b/components/cycle-day/cycle-day-overview.js @@ -6,13 +6,14 @@ import { Dimensions } from 'react-native' import { LocalDate } from 'js-joda' +import Svg from 'react-native-svg' import Header from '../header' import { getOrCreateCycleDay } from '../../db' import cycleModule from '../../lib/cycle' -import Icon from 'react-native-vector-icons/FontAwesome' -import styles, { iconStyles } from '../../styles' +import styles from '../../styles' import * as labels from './labels/labels' import { AppText } from '../app-text' +import MucusIcon from '../../assets/mucus' const bleedingLabels = labels.bleeding const feelingLabels = labels.mucus.feeling.categories @@ -80,7 +81,11 @@ export default class CycleDayOverView extends Component { onPress={() => this.navigate('MucusEditView')} data={getLabel('mucus', cycleDay.mucus)} disabled={dateInFuture} - /> + > + + + + this.navigate('CervixEditView')} @@ -222,10 +227,6 @@ class SymptomBox extends Component { render() { 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 : {} @@ -235,10 +236,12 @@ class SymptomBox extends Component { disabled={this.props.disabled} > - + + {this.props.children ? + React.cloneElement(this.props.children, {active: true}) + : null + } + {this.props.title}