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

Merge branch '302-bug-stats-crash' into 'master'

Browse Source 
Resolve "bug: stats crash"

Closes #302

See merge request bloodyhealth/drip!177
This commit is contained in:
bl00dymarie
2019-02-07 19:40:03 +00:00
parent e42aa9bb8e 9b1d47be0d
commit 548b2826da
2 changed files with 41 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/stats.js
+37 -27
View File
@@ -9,11 +9,12 @@ import cycleModule from '../lib/cycle'
import {getCycleLengthStats as getCycleInfo} from '../lib/cycle-length' import {getCycleLengthStats as getCycleInfo} from '../lib/cycle-length'
import {stats as labels} from '../i18n/en/labels' import {stats as labels} from '../i18n/en/labels'
import AppText from './app-text' import AppText from './app-text'
import FramedSegment from './framed-segment'
export default class Stats extends Component { export default class Stats extends Component {
render() { render() {
const cycleLengths = cycleModule().getAllCycleLengths() const cycleLengths = cycleModule().getAllCycleLengths()
const atLeastOneCycle = cycleLengths.length > 1 const atLeastOneCycle = cycleLengths.length >= 1
let numberOfCycles let numberOfCycles
let cycleInfo let cycleInfo
if (atLeastOneCycle) { if (atLeastOneCycle) {
@@ -24,43 +25,52 @@ export default class Stats extends Component {
} }
return ( return (
<ScrollView> <ScrollView>
<View style={[styles.textWrappingView]}> <FramedSegment
<AppText style={styles.title}>{labels.cycleLengthTitle}</AppText> style={styles.framedSegmentLast}
<AppText style={styles.paragraph}>{labels.cycleLengthExplainer}</AppText> title={labels.cycleLengthTitle}
>
<AppText style={styles.paragraph}>
{labels.cycleLengthExplainer}
</AppText>
{!atLeastOneCycle && {!atLeastOneCycle &&
<AppText>{labels.emptyStats}</AppText> <AppText>{labels.emptyStats}</AppText>
} }
{atLeastOneCycle && numberOfCycles === 1 && {atLeastOneCycle && numberOfCycles === 1 &&
<AppText> <View style={[styles.statsRow, styles.paragraph]}>
{labels.oneCycleStats} <AppText>{labels.oneCycleStats}</AppText>
<AppText style={styles.emphasis}> {cycleLengths[0]} </AppText> <AppText style={styles.emphasis}> {cycleLengths[0]} </AppText>
{labels.daysLabel + '.'} <AppText>{labels.daysLabel}.</AppText>
</AppText> </View>
} }
{atLeastOneCycle && numberOfCycles > 1 && <View> {atLeastOneCycle && numberOfCycles > 1 && <View>
<View style={styles.statsRow}> <View style={styles.paragraph}>
<AppText style={[styles.statsLabelLeft, styles.emphasis]}>{labels.averageLabel}</AppText> <AppText style={styles.emphasis}>
<AppText style={[styles.statsLabelRight, styles.emphasis]}>{cycleInfo.mean + ' ' + labels.daysLabel}</AppText> {labels.averageLabel}: {cycleInfo.mean} {labels.daysLabel}
</AppText>
</View>
<View>
<AppText>
{labels.minLabel}: {cycleInfo.minimum} {labels.daysLabel}
</AppText>
</View>
<View>
<AppText>
{labels.maxLabel}: {cycleInfo.maximum} {labels.daysLabel}
</AppText>
</View>
<View style={styles.paragraph}>
<AppText>
{labels.stdLabel}: {cycleInfo.stdDeviation} {labels.daysLabel}
</AppText>
</View> </View>
<View style={styles.statsRow}> <View style={styles.statsRow}>
<AppText style={styles.statsLabelLeft}>{labels.minLabel}</AppText> <AppText>{labels.basisOfStatsBeginning}</AppText>
<AppText style={styles.statsLabelRight}>{cycleInfo.minimum + ' ' + labels.daysLabel}</AppText>
</View>
<View style={styles.statsRow}>
<AppText style={styles.statsLabelLeft}>{labels.maxLabel}</AppText>
<AppText style={styles.statsLabelRight}>{cycleInfo.maximum + ' ' + labels.daysLabel}</AppText>
</View>
<View style={[styles.statsRow, styles.paragraph]}>
<AppText style={styles.statsLabelLeft}>{labels.stdLabel}</AppText>
<AppText style={styles.statsLabelRight}>{cycleInfo.stdDeviation + ' ' + labels.daysLabel}</AppText>
</View>
<AppText>
{labels.basisOfStatsBeginning}
<AppText style={styles.emphasis}> {numberOfCycles} </AppText> <AppText style={styles.emphasis}> {numberOfCycles} </AppText>
{labels.basisOfStatsEnd} <AppText>{labels.basisOfStatsEnd}</AppText>
</AppText> </View>
</View>} </View>}
</View> </FramedSegment>
</ScrollView> </ScrollView>
) )
} }
styles/index.js
+3 -12
View File
@@ -45,7 +45,8 @@ export default StyleSheet.create({
}, },
emphasis: { emphasis: {
fontWeight: 'bold', fontWeight: 'bold',
fontFamily: textFontBold fontFamily: textFontBold,
color: secondaryColor,
}, },
link: { link: {
color: cycleDayColor, color: cycleDayColor,
@@ -308,17 +309,7 @@ export default StyleSheet.create({
}, },
statsRow: { statsRow: {
flexDirection: 'row', flexDirection: 'row',
width: '100%' flexWrap: 'wrap'
},
statsLabelLeft: {
width: '60%',
textAlign: 'left',
textAlignVertical: 'center',
marginLeft: 10
},
statsLabelRight: {
textAlign: 'left',
textAlignVertical: 'center'
}, },
menuLabel: { menuLabel: {
fontSize: 15, fontSize: 15,