From 9868e8a9436b0c64bb7f1c96f7b2e5665d743dd5 Mon Sep 17 00:00:00 2001
From: Julia Friesel <julia.friesel@gmail.com>
Date: Sat, 1 Sep 2018 20:47:57 +0200
Subject: [PATCH] Add explainer texts to cervix
---
components/cycle-day/labels/labels.js | 19 ++++++++++++++---
components/cycle-day/symptoms/cervix.js | 27 ++++++++++++-------------
2 files changed, 29 insertions(+), 17 deletions(-)
diff --git a/components/cycle-day/labels/labels.js b/components/cycle-day/labels/labels.js
index 90faf28a..522686f7 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 ba1872e0..a2ff9784 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}
--
GitLab