diff --git a/components/cycle-day/labels/labels.js b/components/cycle-day/labels/labels.js index 90faf28acf603e0bea205e253323be41c48bc0f0..522686f74701edde9c9478d37dcf43aa761d26e7 100644 --- a/components/cycle-day/labels/labels.js +++ b/components/cycle-day/labels/labels.js @@ -2,10 +2,23 @@ export const bleeding = ['spotting', 'light', 'medium', 'heavy'] export const mucusFeeling = ['dry', 'nothing', 'wet', 'slippery'] export const mucusTexture = ['nothing', 'creamy', 'egg white'] export const mucusNFP = ['t', 'Ø', 'f', 'S', 'S+'] -export const cervixOpening = ['closed', 'medium', 'open'] -export const cervixFirmness = ['hard', 'soft'] -export const cervixPosition = ['low', 'medium', 'high'] export const intensity = ['low', 'medium', 'high'] + +export const cervix = { + opening: { + categories: ['closed', 'medium', 'open'], + explainer: 'Is your cervix open or closed?' + }, + firmness: { + categories: ['hard', 'soft'], + explainer: "When it's hard it might feel like the tip of your nose" + }, + position: { + categories: ['low', 'medium', 'high'], + explainer: 'How high up in the vagina is the cervix?' + } +} + export const sex = { solo: 'Solo', partner: 'Partner', diff --git a/components/cycle-day/symptoms/cervix.js b/components/cycle-day/symptoms/cervix.js index ba1872e0d6b9c77ce3b9fadaa90b27fc5ee3dec8..a2ff9784d71fbb233cdca6008f7706a7864b4b08 100644 --- a/components/cycle-day/symptoms/cervix.js +++ b/components/cycle-day/symptoms/cervix.js @@ -6,14 +6,10 @@ import { } from 'react-native' import styles from '../../../styles' import { saveSymptom } from '../../../db' -import { - cervixOpening as openingLabels, - cervixFirmness as firmnessLabels, - cervixPosition as positionLabels -} from '../labels/labels' +import {cervix as labels} from '../labels/labels' import ActionButtonFooter from './action-button-footer' import SelectTabGroup from '../select-tab-group' -import { SymptomSectionHeader } from '../../app-text' +import { SymptomSectionHeader, AppText } from '../../app-text' export default class Cervix extends Component { constructor(props) { @@ -36,36 +32,39 @@ export default class Cervix extends Component { render() { const cervixOpeningRadioProps = [ - {label: openingLabels[0], value: 0}, - {label: openingLabels[1], value: 1}, - {label: openingLabels[2], value: 2} + {label: labels.opening.categories[0], value: 0}, + {label: labels.opening.categories[1], value: 1}, + {label: labels.opening.categories[2], value: 2} ] const cervixFirmnessRadioProps = [ - {label: firmnessLabels[0], value: 0 }, - {label: firmnessLabels[1], value: 1 } + {label: labels.firmness.categories[0], value: 0 }, + {label: labels.firmness.categories[1], value: 1 } ] const cervixPositionRadioProps = [ - {label: positionLabels[0], value: 0 }, - {label: positionLabels[1], value: 1 }, - { label: positionLabels[2], value: 2 } + {label: labels.position.categories[0], value: 0 }, + {label: labels.position.categories[1], value: 1 }, + { label: labels.position.categories[2], value: 2 } ] return ( <View style={{ flex: 1 }}> <ScrollView style={styles.page}> <View> <SymptomSectionHeader>Opening</SymptomSectionHeader> + <AppText>{labels.opening.explainer}</AppText> <SelectTabGroup buttons={cervixOpeningRadioProps} active={this.state.opening} onSelect={val => this.setState({ opening: val })} /> <SymptomSectionHeader>Firmness</SymptomSectionHeader> + <AppText>{labels.firmness.explainer}</AppText> <SelectTabGroup buttons={cervixFirmnessRadioProps} active={this.state.firmness} onSelect={val => this.setState({ firmness: val })} /> <SymptomSectionHeader>Position</SymptomSectionHeader> + <AppText>{labels.position.explainer}</AppText> <SelectTabGroup buttons={cervixPositionRadioProps} active={this.state.position}