From 9b1d47be0d8fb949951247504ff2b0859482d300 Mon Sep 17 00:00:00 2001 From: emelko Date: Thu, 7 Feb 2019 19:45:57 +0100 Subject: [PATCH] Implements MR review: * adds flexWrap to text * rearranges text passages in stats Co-Authored-By: tina <1700791-liv-theo@users.noreply.gitlab.com> --- components/stats.js | 41 ++++++++++++++++++++++++----------------- styles/index.js | 2 +- 2 files changed, 25 insertions(+), 18 deletions(-) diff --git a/components/stats.js b/components/stats.js index 6a4ce8a..2488510 100644 --- a/components/stats.js +++ b/components/stats.js @@ -29,37 +29,44 @@ export default class Stats extends Component { style={styles.framedSegmentLast} title={labels.cycleLengthTitle} > - {labels.cycleLengthExplainer} + + {labels.cycleLengthExplainer} + + {!atLeastOneCycle && {labels.emptyStats} } {atLeastOneCycle && numberOfCycles === 1 && - + {labels.oneCycleStats} - {' ' + cycleLengths[0] + ' '} - {labels.daysLabel + '.'} + {cycleLengths[0]} + {labels.daysLabel}. } {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} - {' ' + numberOfCycles + ' '} + {numberOfCycles} {labels.basisOfStatsEnd} } diff --git a/styles/index.js b/styles/index.js index 29eb7a3..767bade 100644 --- a/styles/index.js +++ b/styles/index.js @@ -306,7 +306,7 @@ export default StyleSheet.create({ }, statsRow: { flexDirection: 'row', - width: '100%' + flexWrap: 'wrap' }, menuLabel: { fontSize: 15,