From cffa42ed1c8513bf7c2c50d6690b9fb53600fa97 Mon Sep 17 00:00:00 2001
From: Julia Friesel <julia.friesel@gmail.com>
Date: Sat, 1 Sep 2018 22:01:05 +0200
Subject: [PATCH] Add explainers to mucus

---
 components/cycle-day/labels/labels.js  | 14 ++++++-
 components/cycle-day/symptoms/mucus.js | 56 ++++++++++++++------------
 2 files changed, 43 insertions(+), 27 deletions(-)

diff --git a/components/cycle-day/labels/labels.js b/components/cycle-day/labels/labels.js
index a1f39907..c0af37bb 100644
--- a/components/cycle-day/labels/labels.js
+++ b/components/cycle-day/labels/labels.js
@@ -1,6 +1,4 @@
 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 intensity = ['low', 'medium', 'high']
 
@@ -19,6 +17,18 @@ export const cervix = {
   }
 }
 
+export const mucus = {
+  feeling: {
+    categories: ['dry', 'nothing', 'wet', 'slippery'],
+    explainer: 'What does your vaginal entrance feel like?'
+  },
+  texture: {
+    categories: ['nothing', 'creamy', 'egg white'],
+    explainer: "Looking at and touching your cervical mucus, which describes it best?"
+  },
+  excludeExplainer: "You can exclude this value if you don't want to use it for fertility detection"
+}
+
 export const desire = {
   header: 'Intensity',
   explainer: 'How would you rate your sexual desire?'
diff --git a/components/cycle-day/symptoms/mucus.js b/components/cycle-day/symptoms/mucus.js
index 586fcb23..d1b7966a 100644
--- a/components/cycle-day/symptoms/mucus.js
+++ b/components/cycle-day/symptoms/mucus.js
@@ -6,14 +6,11 @@ import {
 } from 'react-native'
 import styles from '../../../styles'
 import { saveSymptom } from '../../../db'
-import {
-  mucusFeeling as feelingLabels,
-  mucusTexture as textureLabels
-} from '../labels/labels'
+import { mucus as labels } from '../labels/labels'
 import computeSensiplanValue from '../../../lib/sensiplan-mucus'
 import ActionButtonFooter from './action-button-footer'
 import SelectTabGroup from '../select-tab-group'
-import { SymptomSectionHeader } from '../../app-text'
+import SymptomSection from './symptom-section';
 
 
 export default class Mucus extends Component {
@@ -37,42 +34,51 @@ export default class Mucus extends Component {
 
   render() {
     const mucusFeeling = [
-      { label: feelingLabels[0], stateKey: ''},
-      { label: feelingLabels[1], value: 1 },
-      { label: feelingLabels[2], value: 2 },
-      { label: feelingLabels[3], value: 3 }
+      { label: labels.feeling.categories[0], stateKey: ''},
+      { label: labels.feeling.categories[1], value: 1 },
+      { label: labels.feeling.categories[2], value: 2 },
+      { label: labels.feeling.categories[3], value: 3 }
     ]
     const mucusTexture = [
-      { label: textureLabels[0], value: 0 },
-      { label: textureLabels[1], value: 1 },
-      { label: textureLabels[2], value: 2 }
+      { label: labels.texture.categories[0], value: 0 },
+      { label: labels.texture.categories[1], value: 1 },
+      { label: labels.texture.categories[2], value: 2 }
     ]
     return (
       <View style={{ flex: 1 }}>
         <ScrollView style={styles.page}>
-          <View>
-            <SymptomSectionHeader>Feeling</SymptomSectionHeader>
+          <SymptomSection
+            header='Feeling'
+            explainer={labels.feeling.explainer}
+          >
             <SelectTabGroup
               buttons={mucusFeeling}
               onSelect={val => this.setState({ feeling: val })}
               active={this.state.feeling}
             />
-            <SymptomSectionHeader>Texture</SymptomSectionHeader>
+          </SymptomSection>
+          <SymptomSection
+            header='Texture'
+            explainer={labels.texture.explainer}
+          >
             <SelectTabGroup
               buttons={mucusTexture}
               onSelect={val => this.setState({ texture: val })}
               active={this.state.texture}
             />
-            <View style={styles.symptomViewRowInline}>
-              <SymptomSectionHeader>Exclude</SymptomSectionHeader>
-              <Switch
-                onValueChange={(val) => {
-                  this.setState({ exclude: val })
-                }}
-                value={this.state.exclude}
-              />
-            </View>
-          </View>
+          </SymptomSection>
+          <SymptomSection
+            header="Exclude"
+            explainer={labels.excludeExplainer}
+            inlineExplainer={true}
+          >
+            <Switch
+              onValueChange={(val) => {
+                this.setState({ exclude: val })
+              }}
+              value={this.state.exclude}
+            />
+          </SymptomSection>
         </ScrollView>
         <ActionButtonFooter
           symptom='mucus'
-- 
GitLab