Implements MR review:
* 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:
+24
-17
@@ -29,37 +29,44 @@ export default class Stats extends Component {
|
|||||||
style={styles.framedSegmentLast}
|
style={styles.framedSegmentLast}
|
||||||
title={labels.cycleLengthTitle}
|
title={labels.cycleLengthTitle}
|
||||||
>
|
>
|
||||||
<AppText style={styles.paragraph}>{labels.cycleLengthExplainer}</AppText>
|
<AppText style={styles.paragraph}>
|
||||||
|
{labels.cycleLengthExplainer}
|
||||||
|
</AppText>
|
||||||
|
|
||||||
{!atLeastOneCycle &&
|
{!atLeastOneCycle &&
|
||||||
<AppText>{labels.emptyStats}</AppText>
|
<AppText>{labels.emptyStats}</AppText>
|
||||||
}
|
}
|
||||||
{atLeastOneCycle && numberOfCycles === 1 &&
|
{atLeastOneCycle && numberOfCycles === 1 &&
|
||||||
<View style={styles.statsRow}>
|
<View style={[styles.statsRow, styles.paragraph]}>
|
||||||
<AppText>{labels.oneCycleStats}</AppText>
|
<AppText>{labels.oneCycleStats}</AppText>
|
||||||
<AppText style={styles.emphasis}>{' ' + cycleLengths[0] + ' '}</AppText>
|
<AppText style={styles.emphasis}> {cycleLengths[0]} </AppText>
|
||||||
<AppText>{labels.daysLabel + '.'}</AppText>
|
<AppText>{labels.daysLabel}.</AppText>
|
||||||
</View>
|
</View>
|
||||||
}
|
}
|
||||||
{atLeastOneCycle && numberOfCycles > 1 && <View>
|
{atLeastOneCycle && numberOfCycles > 1 && <View>
|
||||||
<View style={styles.statsRow}>
|
<View style={styles.paragraph}>
|
||||||
<AppText style={styles.emphasis}>{labels.averageLabel}</AppText>
|
<AppText style={styles.emphasis}>
|
||||||
<AppText style={styles.emphasis}>{': ' + cycleInfo.mean + ' ' + labels.daysLabel}</AppText>
|
{labels.averageLabel}: {cycleInfo.mean} {labels.daysLabel}
|
||||||
|
</AppText>
|
||||||
</View>
|
</View>
|
||||||
<View style={styles.statsRow}>
|
<View>
|
||||||
<AppText>{labels.minLabel}</AppText>
|
<AppText>
|
||||||
<AppText>{': ' + cycleInfo.minimum + ' ' + labels.daysLabel}</AppText>
|
{labels.minLabel}: {cycleInfo.minimum} {labels.daysLabel}
|
||||||
|
</AppText>
|
||||||
</View>
|
</View>
|
||||||
<View style={styles.statsRow}>
|
<View>
|
||||||
<AppText>{labels.maxLabel}</AppText>
|
<AppText>
|
||||||
<AppText>{': ' + cycleInfo.maximum + ' ' + labels.daysLabel}</AppText>
|
{labels.maxLabel}: {cycleInfo.maximum} {labels.daysLabel}
|
||||||
|
</AppText>
|
||||||
</View>
|
</View>
|
||||||
<View style={[styles.statsRow, styles.paragraph]}>
|
<View style={styles.paragraph}>
|
||||||
<AppText>{labels.stdLabel}</AppText>
|
<AppText>
|
||||||
<AppText>{': ' + cycleInfo.stdDeviation + ' ' + labels.daysLabel}</AppText>
|
{labels.stdLabel}: {cycleInfo.stdDeviation} {labels.daysLabel}
|
||||||
|
</AppText>
|
||||||
</View>
|
</View>
|
||||||
<View style={styles.statsRow}>
|
<View style={styles.statsRow}>
|
||||||
<AppText>{labels.basisOfStatsBeginning}</AppText>
|
<AppText>{labels.basisOfStatsBeginning}</AppText>
|
||||||
<AppText style={styles.emphasis}>{' ' + numberOfCycles + ' '} </AppText>
|
<AppText style={styles.emphasis}> {numberOfCycles} </AppText>
|
||||||
<AppText>{labels.basisOfStatsEnd}</AppText>
|
<AppText>{labels.basisOfStatsEnd}</AppText>
|
||||||
</View>
|
</View>
|
||||||
</View>}
|
</View>}
|
||||||
|
|||||||
+1
-1
@@ -306,7 +306,7 @@ export default StyleSheet.create({
|
|||||||
},
|
},
|
||||||
statsRow: {
|
statsRow: {
|
||||||
flexDirection: 'row',
|
flexDirection: 'row',
|
||||||
width: '100%'
|
flexWrap: 'wrap'
|
||||||
},
|
},
|
||||||
menuLabel: {
|
menuLabel: {
|
||||||
fontSize: 15,
|
fontSize: 15,
|
||||||
|
|||||||
Reference in New Issue
Block a user