diff --git a/components/home.js b/components/home.js index 69604b0..ae09c3e 100644 --- a/components/home.js +++ b/components/home.js @@ -17,18 +17,9 @@ import { getFertilityStatusForDay } from '../lib/sympto-adapter' import styles, { cycleDayColor, periodColor, secondaryColor } from '../styles' import AppText from './app-text' import Button from './button' +import IconText from './icon-text' import { formatDateForShortText } from './helpers/format-date' -const IconText = ({ children, wrapperStyles }) => { - return ( - - - { children } - - - ) -} - const HomeElement = ({ children, onPress, buttonColor, buttonLabel }) => { return ( - - {cycleDayNumber || labels.unknown} - + {cycleDayNumber || labels.unknown} {cycleDayMoreText} @@ -122,7 +111,7 @@ class Home extends Component { > - + {this.state.bleedingPredictionRange} @@ -138,9 +127,7 @@ class Home extends Component { > - - { phase ? phase.toString() : labels.unknown } - + { phase ? phase.toString() : labels.unknown } { phase && diff --git a/components/icon-text.js b/components/icon-text.js new file mode 100644 index 0000000..be30d48 --- /dev/null +++ b/components/icon-text.js @@ -0,0 +1,24 @@ +import React from 'react' +import { View } from 'react-native' +import PropTypes from 'prop-types' + +import AppText from './app-text' + +import styles from '../styles' + +const IconText = ({ children, wrapperStyles }) => { + return ( + + + { children } + + + ) +} + +IconText.propTypes = { + children: PropTypes.node, + wrapperStyles: PropTypes.object, +} + +export default IconText diff --git a/styles/index.js b/styles/index.js index 7825d11..1b9bb4f 100644 --- a/styles/index.js +++ b/styles/index.js @@ -131,14 +131,12 @@ export default StyleSheet.create({ homeIconTextWrapper: { alignItems: 'center', justifyContent: 'center', + width: 80, + position: 'absolute', }, homeIconAndText: { justifyContent: 'center' }, - wrapperIcon: { - width: 80, - position: 'absolute' - }, homeCircle: { borderRadius: 100, borderWidth: 2.3,