diff --git a/components/stats.js b/components/stats.js index 23a83d1..6a4ce8a 100644 --- a/components/stats.js +++ b/components/stats.js @@ -9,6 +9,7 @@ import cycleModule from '../lib/cycle' import {getCycleLengthStats as getCycleInfo} from '../lib/cycle-length' import {stats as labels} from '../i18n/en/labels' import AppText from './app-text' +import FramedSegment from './framed-segment' export default class Stats extends Component { render() { @@ -24,8 +25,10 @@ export default class Stats extends Component { } return ( - - {labels.cycleLengthTitle} + {labels.cycleLengthExplainer} {!atLeastOneCycle && {labels.emptyStats} @@ -39,20 +42,20 @@ export default class Stats extends Component { } {atLeastOneCycle && numberOfCycles > 1 && - {labels.averageLabel} - {cycleInfo.mean + ' ' + labels.daysLabel} + {labels.averageLabel} + {': ' + cycleInfo.mean + ' ' + labels.daysLabel} - {labels.minLabel} - {cycleInfo.minimum + ' ' + labels.daysLabel} + {labels.minLabel} + {': ' + cycleInfo.minimum + ' ' + labels.daysLabel} - {labels.maxLabel} - {cycleInfo.maximum + ' ' + labels.daysLabel} + {labels.maxLabel} + {': ' + cycleInfo.maximum + ' ' + labels.daysLabel} - {labels.stdLabel} - {cycleInfo.stdDeviation + ' ' + labels.daysLabel} + {labels.stdLabel} + {': ' + cycleInfo.stdDeviation + ' ' + labels.daysLabel} {labels.basisOfStatsBeginning} @@ -60,7 +63,7 @@ export default class Stats extends Component { {labels.basisOfStatsEnd} } - + ) } diff --git a/styles/index.js b/styles/index.js index 8893a4e..29eb7a3 100644 --- a/styles/index.js +++ b/styles/index.js @@ -45,7 +45,8 @@ export default StyleSheet.create({ }, emphasis: { fontWeight: 'bold', - fontFamily: textFontBold + fontFamily: textFontBold, + color: secondaryColor, }, link: { color: cycleDayColor, @@ -307,16 +308,6 @@ export default StyleSheet.create({ flexDirection: 'row', width: '100%' }, - statsLabelLeft: { - width: '60%', - textAlign: 'left', - textAlignVertical: 'center', - marginLeft: 10 - }, - statsLabelRight: { - textAlign: 'left', - textAlignVertical: 'center' - }, menuLabel: { fontSize: 15, color: fontOnPrimaryColor