diff --git a/components/app-text.js b/components/app-text.js index 2f1f826..829e8b3 100644 --- a/components/app-text.js +++ b/components/app-text.js @@ -10,6 +10,7 @@ export default function AppText(props) { {props.children} diff --git a/components/cycle-day/cycle-day-overview.js b/components/cycle-day/cycle-day-overview.js index dd5dd10..75036c4 100644 --- a/components/cycle-day/cycle-day-overview.js +++ b/components/cycle-day/cycle-day-overview.js @@ -167,10 +167,7 @@ export default class CycleDayOverView extends Component { } const symptomValue = cycleDay[symptomName] - const label = l[symptomName](symptomValue) - if (!label) return - if (label.length < 45) return label - return label.slice(0, 42) + '...' + return l[symptomName](symptomValue) } render() { @@ -293,7 +290,10 @@ class SymptomBox extends Component { - {this.props.data} + {this.props.data} ) diff --git a/components/cycle-day/symptoms/info-symptom.js b/components/cycle-day/symptoms/info-symptom.js index dc8f365..951ed47 100644 --- a/components/cycle-day/symptoms/info-symptom.js +++ b/components/cycle-day/symptoms/info-symptom.js @@ -1,11 +1,9 @@ import React, { Component } from 'react' -import { - View, - ScrollView -} from 'react-native' -import styles from '../../../styles' +import { ScrollView } from 'react-native' import AppText from '../../app-text' -import * as labels from '../../../i18n/en/symptom-info.js' +import labels from '../../../i18n/en/symptom-info.js' +import FramedSegment from '../../framed-segment' +import styles from '../../../styles/index' export default class InfoSymptom extends Component { render() { @@ -14,6 +12,7 @@ export default class InfoSymptom extends Component { BleedingEditView: 'bleeding', CervixEditView: 'cervix', DesireEditView: 'desire', + MoodEditView: 'mood', MucusEditView: 'mucus', NoteEditView: 'note', PainEditView: 'pain', @@ -21,22 +20,15 @@ export default class InfoSymptom extends Component { TemperatureEditView: 'temperature' } const currentSymptom = symptomMapping[symptomView] - const currentSymptomText = labels.symptomInfo[currentSymptom] - const currentSymptomTitle = labels.symptomTitle[currentSymptom] + return ( - - - {currentSymptomTitle} - - - {currentSymptomText} - {labels.symptomTitle.currentSymptomTitle} - - - {labels.symptomInfo.currentSymptomText} - - + + {labels[currentSymptom].text} + ) } diff --git a/components/framed-segment.js b/components/framed-segment.js new file mode 100644 index 0000000..5d2c68f --- /dev/null +++ b/components/framed-segment.js @@ -0,0 +1,26 @@ +import React from 'react' +import PropTypes from 'prop-types' + +import { View } from 'react-native' +import AppText from './app-text' +import styles from '../styles' + +const FramedSegment = ({ children, ...props }) => { + const style = [styles.framedSegment, props.style] + if (props.last) style.push(styles.framedSegmentLast) + return ( + + { + props.title + && {props.title} + } + {children} + + ) +} + +FramedSegment.propTypes = { + title: PropTypes.string +} + +export default FramedSegment diff --git a/components/license.js b/components/license.js index 027e34b..a908c5c 100644 --- a/components/license.js +++ b/components/license.js @@ -11,7 +11,7 @@ const labels = settingsLabels.license export default function License({setLicense}) { return ( - {labels.title} + {labels.title} {labels.text}