diff --git a/components/stats.js b/components/stats.js index d9ec69c..2488510 100644 --- a/components/stats.js +++ b/components/stats.js @@ -9,11 +9,12 @@ 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() { const cycleLengths = cycleModule().getAllCycleLengths() - const atLeastOneCycle = cycleLengths.length > 1 + const atLeastOneCycle = cycleLengths.length >= 1 let numberOfCycles let cycleInfo if (atLeastOneCycle) { @@ -24,44 +25,53 @@ export default class Stats extends Component { } return ( - - {labels.cycleLengthTitle} - {labels.cycleLengthExplainer} + + + {labels.cycleLengthExplainer} + + {!atLeastOneCycle && {labels.emptyStats} } {atLeastOneCycle && numberOfCycles === 1 && - - {labels.oneCycleStats} + + {labels.oneCycleStats} {cycleLengths[0]} - {labels.daysLabel + '.'} - + {labels.daysLabel}. + } {atLeastOneCycle && numberOfCycles > 1 && - - {labels.averageLabel} - {cycleInfo.mean + ' ' + labels.daysLabel} + + + {labels.averageLabel}: {cycleInfo.mean} {labels.daysLabel} + + + + + {labels.minLabel}: {cycleInfo.minimum} {labels.daysLabel} + + + + + {labels.maxLabel}: {cycleInfo.maximum} {labels.daysLabel} + + + + + {labels.stdLabel}: {cycleInfo.stdDeviation} {labels.daysLabel} + - {labels.minLabel} - {cycleInfo.minimum + ' ' + labels.daysLabel} - - - {labels.maxLabel} - {cycleInfo.maximum + ' ' + labels.daysLabel} - - - {labels.stdLabel} - {cycleInfo.stdDeviation + ' ' + labels.daysLabel} - - - {labels.basisOfStatsBeginning} + {labels.basisOfStatsBeginning} {numberOfCycles} - {labels.basisOfStatsEnd} - + {labels.basisOfStatsEnd} + } - + ) } -} \ No newline at end of file +} diff --git a/styles/index.js b/styles/index.js index 2d6b91b..c0dac87 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, @@ -308,17 +309,7 @@ export default StyleSheet.create({ }, statsRow: { flexDirection: 'row', - width: '100%' - }, - statsLabelLeft: { - width: '60%', - textAlign: 'left', - textAlignVertical: 'center', - marginLeft: 10 - }, - statsLabelRight: { - textAlign: 'left', - textAlignVertical: 'center' + flexWrap: 'wrap' }, menuLabel: { fontSize: 15,