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

Make uniform info icon and leave some space

See merge request bloodyhealth/drip!223
This commit is contained in:
bl00dymarie
2019-05-28 06:38:14 +00:00
3 changed files with 8 additions and 9 deletions
@@ -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
name="info"
{...iconStyles.infoInSymptomView}
style={iconStyles.symptomInfo}
<Icon
name="info-with-circle"
style={iconStyles.info}
/>
</TouchableOpacity>
{ this.state.showInfo &&
+3 -3
View File
@@ -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}/>
<AppText style={styles.framedSegmentTitle}>{`${labels.preOvu.title} `}</AppText>
<Icon name="info-with-circle"/>
<AppText style={styles.framedSegmentTitle}>{` ${labels.preOvu.title} `}</AppText>
</View>
<AppText>{labels.preOvu.note}</AppText>
</FramedSegment>
+1 -1
View File
@@ -472,7 +472,7 @@ export const iconStyles = {
symptomBoxActive: {
color: fontOnPrimaryColor
},
symptomInfo: {
info: {
color: secondaryColor,
fontSize: 25
},