lori/drip
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implements MR review:

Browse Source 
* adds flexWrap to text
* rearranges text passages in stats

Co-Authored-By: tina <1700791-liv-theo@users.noreply.gitlab.com>
This commit is contained in:
emelko
2019-02-07 19:45:57 +01:00
parent 646543c928
commit 9b1d47be0d
2 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/stats.js
+24 -17
View File
@@ -29,37 +29,44 @@ export default class Stats extends Component {
style={styles.framedSegmentLast}
title={labels.cycleLengthTitle}
>
<AppText style={styles.paragraph}>{labels.cycleLengthExplainer}</AppText>
<AppText style={styles.paragraph}>
{labels.cycleLengthExplainer}
</AppText>
{!atLeastOneCycle &&
<AppText>{labels.emptyStats}</AppText>
}
{atLeastOneCycle && numberOfCycles === 1 &&
<View style={styles.statsRow}>
<View style={[styles.statsRow, styles.paragraph]}>
<AppText>{labels.oneCycleStats}</AppText>
<AppText style={styles.emphasis}>{' ' + cycleLengths[0] + ' '}</AppText>
<AppText>{labels.daysLabel + '.'}</AppText>
<AppText style={styles.emphasis}> {cycleLengths[0]} </AppText>
<AppText>{labels.daysLabel}.</AppText>
</View>
}
{atLeastOneCycle && numberOfCycles > 1 && <View>
<View style={styles.statsRow}>
<AppText style={styles.emphasis}>{labels.averageLabel}</AppText>
<AppText style={styles.emphasis}>{': ' + cycleInfo.mean + ' ' + labels.daysLabel}</AppText>
<View style={styles.paragraph}>
<AppText style={styles.emphasis}>
{labels.averageLabel}: {cycleInfo.mean} {labels.daysLabel}
</AppText>
</View>
<View style={styles.statsRow}>
<AppText>{labels.minLabel}</AppText>
<AppText>{': ' + cycleInfo.minimum + ' ' + labels.daysLabel}</AppText>
<View>
<AppText>
{labels.minLabel}: {cycleInfo.minimum} {labels.daysLabel}
</AppText>
</View>
<View style={styles.statsRow}>
<AppText>{labels.maxLabel}</AppText>
<AppText>{': ' + cycleInfo.maximum + ' ' + labels.daysLabel}</AppText>
<View>
<AppText>
{labels.maxLabel}: {cycleInfo.maximum} {labels.daysLabel}
</AppText>
</View>
<View style={[styles.statsRow, styles.paragraph]}>
<AppText>{labels.stdLabel}</AppText>
<AppText>{': ' + cycleInfo.stdDeviation + ' ' + labels.daysLabel}</AppText>
<View style={styles.paragraph}>
<AppText>
{labels.stdLabel}: {cycleInfo.stdDeviation} {labels.daysLabel}
</AppText>
</View>
<View style={styles.statsRow}>
<AppText>{labels.basisOfStatsBeginning}</AppText>
<AppText style={styles.emphasis}>{' ' + numberOfCycles + ' '} </AppText>
<AppText style={styles.emphasis}> {numberOfCycles} </AppText>
<AppText>{labels.basisOfStatsEnd}</AppText>
</View>
</View>}
styles/index.js
+1 -1
View File
@@ -306,7 +306,7 @@ export default StyleSheet.create({
},
statsRow: {
flexDirection: 'row',
width: '100%'
flexWrap: 'wrap'
},
menuLabel: {
fontSize: 15,