Merge branch '286-increase-stroke-width-for-home-screen-elements' into 'master'

Resolve "increase stroke width for home screen elements"

Closes #286

See merge request bloodyhealth/drip!160
This commit is contained in:
Julia Friesel
2019-01-26 12:01:12 +00:00
20 changed files with 44 additions and 36 deletions
-8
View File
@@ -13,14 +13,6 @@ export default function AppText(props) {
)
}
export function AppTextLight(props) {
return (
<Text style={[styles.appTextLight, props.style]}>
{props.children}
</Text>
)
}
export function ActionHint(props) {
if(props.isVisible) {
return (
+7 -7
View File
@@ -8,7 +8,7 @@ import cycleModule from '../lib/cycle'
import { getCycleDaysSortedByDate, getCycleDay } from '../db'
import { getFertilityStatusForDay } from '../lib/sympto-adapter'
import styles from '../styles'
import AppText, { AppTextLight } from './app-text'
import AppText from './app-text'
import DripHomeIcon from '../assets/drip-home-icons'
import Button from './button'
@@ -52,9 +52,9 @@ export default class Home extends Component {
<DripHomeIcon name="circle" size={80} color={cycleDayColor}/>
</View>
<View style={[styles.homeIconTextWrapper, styles.wrapperCycle]}>
<AppTextLight style={styles.iconText}>
<AppText style={styles.iconText}>
{this.state.cycleDayNumber || labels.unknown}
</AppTextLight>
</AppText>
</View>
{ this.state.showMore &&
@@ -74,9 +74,9 @@ export default class Home extends Component {
<DripHomeIcon name="drop" size={105} color={periodColor} />
</View>
<View style={[styles.homeIconTextWrapper, styles.wrapperDrop]}>
<AppTextLight style={styles.iconText}>
<AppText style={styles.iconText}>
{this.state.bleedingPredictionRange}
</AppTextLight>
</AppText>
</View>
{this.state.showMore &&
@@ -102,13 +102,13 @@ export default class Home extends Component {
<View style={styles.homeIconElement}>
<View style={styles.homeCircle} position='absolute' />
<View style={[styles.homeIconTextWrapper, styles.wrapperCircle]}>
<AppTextLight style={styles.iconText}>
<AppText style={styles.iconText}>
{this.state.phase ?
this.state.phase.toString()
:
labels.unknown
}
</AppTextLight>
</AppText>
</View>
{this.state.phase &&
<AppText>