Skip to content
Snippets Groups Projects
Commit 6228cd89 authored by bl00dymarie's avatar bl00dymarie
Browse files

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

Make uniform info icon and leave some space

See merge request bloodyhealth/drip!223
parents 2623fede aadc36f4
No related branches found
No related tags found
No related merge requests found
...@@ -7,7 +7,7 @@ import InfoPopUp from './info-symptom' ...@@ -7,7 +7,7 @@ import InfoPopUp from './info-symptom'
import Header from '../../header/symptom-view' import Header from '../../header/symptom-view'
import { headerTitles } from '../../../i18n/en/labels' import { headerTitles } from '../../../i18n/en/labels'
import { sharedDialogs } from '../../../i18n/en/cycle-day' 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' import styles, { iconStyles } from '../../../styles'
export default class SymptomView extends Component { export default class SymptomView extends Component {
...@@ -79,10 +79,9 @@ export default class SymptomView extends Component { ...@@ -79,10 +79,9 @@ export default class SymptomView extends Component {
}} }}
style={styles.infoButtonSymptomView} style={styles.infoButtonSymptomView}
> >
<FeatherIcon <Icon
name="info" name="info-with-circle"
{...iconStyles.infoInSymptomView} style={iconStyles.info}
style={iconStyles.symptomInfo}
/> />
</TouchableOpacity> </TouchableOpacity>
{ this.state.showInfo && { this.state.showInfo &&
......
...@@ -2,7 +2,7 @@ import React, { Component } from 'react' ...@@ -2,7 +2,7 @@ import React, { Component } from 'react'
import { import {
ScrollView, View ScrollView, View
} from 'react-native' } from 'react-native'
import styles, { iconStyles } from '../../../styles' import styles from '../../../styles'
import labels from '../../../i18n/en/settings' import labels from '../../../i18n/en/settings'
import AppText from '../../app-text' import AppText from '../../app-text'
import FramedSegment from '../../framed-segment' import FramedSegment from '../../framed-segment'
...@@ -28,8 +28,8 @@ export default class Settings extends Component { ...@@ -28,8 +28,8 @@ export default class Settings extends Component {
</FramedSegment> </FramedSegment>
<FramedSegment style={styles.framedSegmentLast} > <FramedSegment style={styles.framedSegmentLast} >
<View style={{flexDirection: 'row', alignItems: 'center'}}> <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> </View>
<AppText>{labels.preOvu.note}</AppText> <AppText>{labels.preOvu.note}</AppText>
</FramedSegment> </FramedSegment>
......
...@@ -472,7 +472,7 @@ export const iconStyles = { ...@@ -472,7 +472,7 @@ export const iconStyles = {
symptomBoxActive: { symptomBoxActive: {
color: fontOnPrimaryColor color: fontOnPrimaryColor
}, },
symptomInfo: { info: {
color: secondaryColor, color: secondaryColor,
fontSize: 25 fontSize: 25
}, },
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment