Merge branch 'Space-between-info-icon-and-text' into 'master'

Make uniform info icon and leave some space

See merge request bloodyhealth/drip!223

components/cycle-day/symptoms/symptom-view.js

@@ -7,7 +7,7 @@ import InfoPopUp from './info-symptom'
 import Header from '../../header/symptom-view'
 import { headerTitles } from '../../../i18n/en/labels'
 import { sharedDialogs } from '../../../i18n/en/cycle-day'
-import FeatherIcon from 'react-native-vector-icons/Feather'
+import Icon from 'react-native-vector-icons/Entypo'
 import styles, { iconStyles } from '../../../styles'
 
 export default class SymptomView extends Component {
@@ -79,10 +79,9 @@ export default class SymptomView extends Component {
             }}
             style={styles.infoButtonSymptomView}
           >
-            <FeatherIcon
+            <Icon
-              name="info"
+              name="info-with-circle"
-              {...iconStyles.infoInSymptomView}
+              style={iconStyles.info}
-              style={iconStyles.symptomInfo}
             />
           </TouchableOpacity>
           { this.state.showInfo &&

components/settings/nfp-settings/index.js

@@ -2,7 +2,7 @@ import React, { Component } from 'react'
 import {
   ScrollView, View
 } from 'react-native'
-import styles, { iconStyles } from '../../../styles'
+import styles from '../../../styles'
 import labels from '../../../i18n/en/settings'
 import AppText from '../../app-text'
 import FramedSegment from '../../framed-segment'
@@ -28,8 +28,8 @@ export default class Settings extends Component {
         </FramedSegment>
         <FramedSegment style={styles.framedSegmentLast} >
           <View style={{flexDirection: 'row', alignItems: 'center'}}>
-            <Icon name="info-with-circle" style={iconStyles.infoInHeading}/>
+            <Icon name="info-with-circle"/>
-            <AppText style={styles.framedSegmentTitle}>{`${labels.preOvu.title} `}</AppText>
+            <AppText style={styles.framedSegmentTitle}>{` ${labels.preOvu.title} `}</AppText>
           </View>
           <AppText>{labels.preOvu.note}</AppText>
         </FramedSegment>

styles/index.js

@@ -472,7 +472,7 @@ export const iconStyles = {
   symptomBoxActive: {
     color: fontOnPrimaryColor
   },
-  symptomInfo: {
+  info: {
     color: secondaryColor,
     fontSize: 25
   },