Merge branch '174-put-date-back-into-symptom-screen' into 'master'

add date to symptom screen header

Closes #174

See merge request bloodyhealth/drip!130

components/app.js

@@ -81,6 +81,7 @@ export default class App extends Component {
             title={headerTitlesLowerCase[this.state.currentPage]}
             isSymptomView={true}
             goBack={this.handleBackButtonPress}
+            date={this.state.currentProps.date}
           />}
 
 

components/header/cycle-day.js

@@ -2,17 +2,9 @@ import React from 'react'
 import {
   View,
   Text} from 'react-native'
-import { LocalDate } from 'js-joda'
-import moment from 'moment'
 import styles from '../../styles'
 import NavigationArrow from './navigation-arrow'
-
-const FormattedDate = ({ date }) => {
-  const today = LocalDate.now()
-  const dateToDisplay = LocalDate.parse(date)
-  const formattedDate = today.equals(dateToDisplay) ? 'today' : moment(date).format('MMMM Do YYYY')
-  return formattedDate.toLowerCase()
-}
+import formatDate from '../helpers/format-date'
 
 export default function CycleDayHeader({ date, ...props }) {
   return (<View style={[styles.header, styles.headerCycleDay]}>
@@ -23,7 +15,7 @@ export default function CycleDayHeader({ date, ...props }) {
     <NavigationArrow direction='left' {...props}/>
     <View>
       <Text style={styles.dateHeader}>
-        <FormattedDate date={date} />
+        {formatDate(date)}
       </Text>
       {props.cycleDayNumber &&
         <Text style={styles.cycleDayNumber}>

components/header/symptom-view.js

@@ -5,6 +5,7 @@ import {
 import styles, { iconStyles } from '../../styles'
 import FeatherIcon from 'react-native-vector-icons/Feather'
 import NavigationArrow from './navigation-arrow'
+import formatDate from '../helpers/format-date'
 
 export default function SymptomViewHeader(props) {
   return (
@@ -21,6 +22,9 @@ export default function SymptomViewHeader(props) {
         <Text style={styles.dateHeader}>
           {props.title}
         </Text>
+        <Text style={styles.cycleDayNumber}>
+          {formatDate(props.date)}
+        </Text>
       </View >
       <FeatherIcon
         name='info'

components/helpers/format-date.js

@@ -0,0 +1,9 @@
+import { LocalDate } from 'js-joda'
+import moment from 'moment'
+
+export default function (date) {
+  const today = LocalDate.now()
+  const dateToDisplay = LocalDate.parse(date)
+  const formattedDate = today.equals(dateToDisplay) ? 'today' : moment(date).format('MMMM Do YYYY')
+  return formattedDate.toLowerCase()
+}