From 163f6b5738cf3f7d18e2493bcabc8450d87609e0 Mon Sep 17 00:00:00 2001
From: tina <lt-bloody@riox.eu>
Date: Fri, 14 Sep 2018 12:26:11 +0200
Subject: [PATCH] little improvements after review
---
components/stats.js | 16 ++++++++--------
styles/index.js | 30 +++++++++++++-----------------
2 files changed, 21 insertions(+), 25 deletions(-)
diff --git a/components/stats.js b/components/stats.js
index d7e6e3b7..897a1ddd 100644
--- a/components/stats.js
+++ b/components/stats.js
@@ -26,23 +26,23 @@ export default class Stats extends Component {
}
return (
<ScrollView>
- <View style={[styles.appHorizontalMargin, styles.appVerticalMargin]}>
- <AppText style={styles.appTextTitle}>{labels.cycleLengthTitle}</AppText>
- <AppText style={styles.appBottomMargin}>{labels.cycleLengthExplainer}</AppText>
+ <View style={[styles.textWrappingView]}>
+ <AppText style={styles.title}>{labels.cycleLengthTitle}</AppText>
+ <AppText style={styles.paragraph}>{labels.cycleLengthExplainer}</AppText>
{!atLeastOneCycle &&
<AppText>{labels.emptyStats}</AppText>
}
{atLeastOneCycle && numberOfCycles === 1 &&
<AppText>
{labels.oneCycleStats}
- <AppText style={styles.appTextEmphasis}> {cycleLengths[0]} </AppText>
+ <AppText style={styles.emphasis}> {cycleLengths[0]} </AppText>
{labels.daysLabel + '.'}
</AppText>
}
{atLeastOneCycle && numberOfCycles > 1 && <View>
<View style={styles.statsRow}>
- <AppText style={[styles.statsLabelLeft, styles.appTextEmphasis]}>{labels.averageLabel}</AppText>
- <AppText style={[styles.statsLabelRight, styles.appTextEmphasis]}>{cycleInfo.mean + ' ' + labels.daysLabel}</AppText>
+ <AppText style={[styles.statsLabelLeft, styles.emphasis]}>{labels.averageLabel}</AppText>
+ <AppText style={[styles.statsLabelRight, styles.emphasis]}>{cycleInfo.mean + ' ' + labels.daysLabel}</AppText>
</View>
<View style={styles.statsRow}>
<AppText style={styles.statsLabelLeft}>{labels.minLabel}</AppText>
@@ -52,13 +52,13 @@ export default class Stats extends Component {
<AppText style={styles.statsLabelLeft}>{labels.maxLabel}</AppText>
<AppText style={styles.statsLabelRight}>{cycleInfo.maximum + ' ' + labels.daysLabel}</AppText>
</View>
- <View style={[styles.statsRow, styles.appBottomMargin]}>
+ <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.appTextEmphasis}> {numberOfCycles} </AppText>
+ <AppText style={styles.emphasis}> {numberOfCycles} </AppText>
{labels.basisOfStatsEnd}
</AppText>
</View>}
diff --git a/styles/index.js b/styles/index.js
index 49d5f32f..e90cac23 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,
- },
- appVerticalMargin: {
- marginTop: 10,
- },
- appHorizontalMargin: {
- marginHorizontal: 10,
+ marginBottom: defaultBottomMargin,
},
- 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,
--
GitLab