diff --git a/components/stats.js b/components/stats.js index d7e6e3b..897a1dd 100644 --- a/components/stats.js +++ b/components/stats.js @@ -26,23 +26,23 @@ export default class Stats extends Component { } return ( - - {labels.cycleLengthTitle} - {labels.cycleLengthExplainer} + + {labels.cycleLengthTitle} + {labels.cycleLengthExplainer} {!atLeastOneCycle && {labels.emptyStats} } {atLeastOneCycle && numberOfCycles === 1 && {labels.oneCycleStats} - {cycleLengths[0]} + {cycleLengths[0]} {labels.daysLabel + '.'} } {atLeastOneCycle && numberOfCycles > 1 && - {labels.averageLabel} - {cycleInfo.mean + ' ' + labels.daysLabel} + {labels.averageLabel} + {cycleInfo.mean + ' ' + labels.daysLabel} {labels.minLabel} @@ -52,13 +52,13 @@ export default class Stats extends Component { {labels.maxLabel} {cycleInfo.maximum + ' ' + 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 49d5f32..e90cac2 100644 --- a/styles/index.js +++ b/styles/index.js @@ -4,26 +4,28 @@ export const primaryColor = '#ff7e5f' export const secondaryColor = '#351c4d' export const fontOnPrimaryColor = 'white' +const defaultBottomMargin = 5 +const defaultIndentation = 10 +const defaultTopMargin = 10 + export default StyleSheet.create({ appText: { color: 'black' }, - appTextEmphasis: { + paragraph: { + marginBottom: defaultBottomMargin + }, + emphasis: { fontWeight: 'bold', }, - appTextTitle: { + title: { fontSize: 18, color: 'black', - marginBottom: 5, + marginBottom: defaultBottomMargin, }, - appVerticalMargin: { - marginTop: 10, - }, - appHorizontalMargin: { - marginHorizontal: 10, - }, - appBottomMargin: { - marginBottom: 5 + textWrappingView: { + marginHorizontal: defaultIndentation, + marginTop: defaultTopMargin }, welcome: { fontSize: 20, @@ -154,12 +156,6 @@ export default StyleSheet.create({ symptomEditButton: { width: 130 }, - /*statsIntro: { - fontSize: 18, - margin: 10, - textAlign: 'left', - textAlignVertical: 'center' - },*/ settingsSegment: { backgroundColor: 'lightgrey', padding: 10,