Merge branch 'fix-fertility-icon-space' into 'master'

Fix fertility icon space

Closes #237

See merge request bloodyhealth/drip!121

components/home.js

@@ -14,6 +14,19 @@ import styles from '../styles'
 import AppText, { AppTextLight } from './app-text'
 import nothingChanged from '../db/db-unchanged'
 
+const HomeButton = ({ backgroundColor, children }) => {
+  return (
+    <View style={[
+      styles.homeButton,
+      {backgroundColor}
+    ]}>
+      <AppText style={styles.homeButtonText}>
+        {children}
+      </AppText>
+    </View>
+  )
+}
+
 export default class Home extends Component {
   constructor(props) {
     super(props)
@@ -92,14 +105,11 @@ export default class Home extends Component {
               { this.state.showMore &&
                   <AppText style={styles.paragraph}>{cycleDayMoreText}</AppText>
               }
-              <View style={[
+
-                styles.homeButton,
+              <HomeButton backgroundColor={cycleDayColor}>
-                { backgroundColor: cycleDayColor }
+                {labels.editToday}
-              ]}>
+              </HomeButton>
-                <AppText style={styles.homeButtonText}>
+
-                  {labels.editToday}
-                </AppText>
-              </View>
             </TouchableOpacity>
 
             <TouchableOpacity
@@ -120,21 +130,21 @@ export default class Home extends Component {
                   {this.state.predictionText}
                 </AppText>
               }
-              <View style={[
+
-                styles.homeButton,
+              <HomeButton backgroundColor={periodColor}>
-                { backgroundColor: periodColor }
+                {labels.trackPeriod}
-              ]}>
+              </HomeButton>
-                <AppText style={styles.homeButtonText}>
+
-                  {labels.trackPeriod}
-                </AppText>
-              </View>
             </TouchableOpacity>
 
             <TouchableOpacity
               onPress={() => this.props.navigate('Chart')}
               style={styles.homeIconElement}
             >
-              <View style={styles.homeCircle}>
+
+              <View style={styles.homeCircle} position='absolute' />
+
+              <View style={[styles.homeIconTextWrapper, styles.wrapperCircle]}>
                 <AppTextLight style={styles.iconText}>
                   {this.state.phase ?
                     this.state.phase.toString()
@@ -153,14 +163,10 @@ export default class Home extends Component {
                   {this.state.statusText}
                 </AppText>
               }
-              <View style={[
+
-                styles.homeButton,
+              <HomeButton backgroundColor={secondaryColor}>
-                { backgroundColor: secondaryColor }
+                {labels.checkFertility}
-              ]}>
+              </HomeButton>
-                <AppText style={styles.homeButtonText}>
-                  {labels.checkFertility}
-                </AppText>
-              </View>
             </TouchableOpacity>
           </View>
 

styles/index.js

@@ -100,13 +100,17 @@ export default StyleSheet.create({
     marginBottom: 10,
   },
   wrapperCycle: {
-    width: 70,
+    width: 80,
-    height: 75
+    height: 77
   },
   wrapperDrop: {
+    width: 81,
+    height: 85,
+    marginTop: 20
+  },
+  wrapperCircle: {
     width: 80,
     height: 80,
-    marginTop: 20
   },
   homeCircle: {
     borderRadius: 100,