From 7f170d06ef56d10dc392da5eb90804f0a907b025 Mon Sep 17 00:00:00 2001 From: emelko Date: Mon, 4 Feb 2019 22:15:34 +0100 Subject: [PATCH 1/4] Make sure stats output some result after one completed cycle --- components/stats.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/stats.js b/components/stats.js index d9ec69c..4668859 100644 --- a/components/stats.js +++ b/components/stats.js @@ -13,7 +13,7 @@ import AppText from './app-text' 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) { From ca905c6bc6cccbb9cfd7da5859b1e6875871a623 Mon Sep 17 00:00:00 2001 From: emelko Date: Mon, 4 Feb 2019 23:00:37 +0100 Subject: [PATCH 2/4] Denastify nesting to make styles.emphasis work Co-Authored-By: tina <1700791-liv-theo@users.noreply.gitlab.com> --- components/stats.js | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/components/stats.js b/components/stats.js index 4668859..23a83d1 100644 --- a/components/stats.js +++ b/components/stats.js @@ -31,11 +31,11 @@ export default class Stats extends Component { {labels.emptyStats} } {atLeastOneCycle && numberOfCycles === 1 && - - {labels.oneCycleStats} - {cycleLengths[0]} - {labels.daysLabel + '.'} - + + {labels.oneCycleStats} + {' ' + cycleLengths[0] + ' '} + {labels.daysLabel + '.'} + } {atLeastOneCycle && numberOfCycles > 1 && @@ -54,14 +54,14 @@ export default class Stats extends Component { {labels.stdLabel} {cycleInfo.stdDeviation + ' ' + labels.daysLabel} - - {labels.basisOfStatsBeginning} - {numberOfCycles} - {labels.basisOfStatsEnd} - + + {labels.basisOfStatsBeginning} + {' ' + numberOfCycles + ' '} + {labels.basisOfStatsEnd} + } ) } -} \ No newline at end of file +} From 646543c9283b2cec15b790dbc9586c6cf54e4fc9 Mon Sep 17 00:00:00 2001 From: emelko Date: Tue, 5 Feb 2019 01:20:35 +0100 Subject: [PATCH 3/4] Make stats look a bit more consistent with framed segment Co-Authored-By: tina <1700791-liv-theo@users.noreply.gitlab.com> --- components/stats.js | 25 ++++++++++++++----------- styles/index.js | 13 ++----------- 2 files changed, 16 insertions(+), 22 deletions(-) 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 From 9b1d47be0d8fb949951247504ff2b0859482d300 Mon Sep 17 00:00:00 2001 From: emelko Date: Thu, 7 Feb 2019 19:45:57 +0100 Subject: [PATCH 4/4] 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,