Styling for homescreen elements to breathe

This commit is contained in:
emelko
2019-05-23 17:09:44 +02:00
parent 668acb4afe
commit 418b9c0f5d
2 changed files with 23 additions and 30 deletions
+12 -10
View File
@@ -30,12 +30,12 @@ const HomeElement = ({ children, onPress, buttonColor, buttonLabel }) => {
return ( return (
<View <View
onPress={ onPress } onPress={ onPress }
style={ styles.homeIconElement } style={ styles.homeElement }
> >
{children[0]} {children[0]}
{children[1]} {children[1]}
<View> <View style={{paddingLeft: 15}}>
{children[2]} {children[2]}
<Button <Button
style={styles.homeButton} style={styles.homeButton}
@@ -96,11 +96,11 @@ export default class Home extends Component {
<View> <View>
<DripHomeIcon name="circle" size={80} color={cycleDayColor}/> <DripHomeIcon name="circle" size={80} color={cycleDayColor}/>
</View> </View>
<IconText wrapperStyles={styles.wrapperCycle}> <IconText wrapperStyles={styles.wrapperIcon}>
{cycleDayNumber || labels.unknown} {cycleDayNumber || labels.unknown}
</IconText> </IconText>
<AppText style={styles.paragraph}>{cycleDayMoreText}</AppText> <AppText style={styles.homeDescriptionText}>{cycleDayMoreText}</AppText>
</HomeElement> </HomeElement>
<HomeElement <HomeElement
@@ -109,14 +109,14 @@ export default class Home extends Component {
buttonLabel={ labels.trackPeriod } buttonLabel={ labels.trackPeriod }
> >
<View> <View>
<DripHomeIcon name="drop" size={105} color={periodColor} /> <DripHomeIcon name="drop" size={100} color={periodColor} />
</View> </View>
<IconText wrapperStyles={styles.wrapperDrop}> <IconText wrapperStyles={styles.wrapperIcon}>
{this.state.bleedingPredictionRange} {this.state.bleedingPredictionRange}
</IconText> </IconText>
<AppText style={styles.paragraph}> <AppText style={styles.homeDescriptionText}>
{this.state.predictionText} {this.state.predictionText}
</AppText> </AppText>
</HomeElement> </HomeElement>
@@ -128,15 +128,17 @@ export default class Home extends Component {
> >
<View style={styles.homeCircle}/> <View style={styles.homeCircle}/>
<IconText wrapperStyles={styles.wrapperCircle}> <IconText wrapperStyles={styles.wrapperIcon}>
{ phase ? phase.toString() : labels.unknown } { phase ? phase.toString() : labels.unknown }
</IconText> </IconText>
{ phase && { phase &&
<AppText>{`${labels.phase(phase)} (${status})`}</AppText> <AppText style={styles.homeDescriptionText}>
{`${labels.phase(phase)} (${status})`}
</AppText>
} }
<View> <View>
<AppText styles={styles.paragraph}> <AppText styles={styles.homeDescriptionText}>
{ `${statusText} ${links.wiki.url}.` } { `${statusText} ${links.wiki.url}.` }
</AppText> </AppText>
</View> </View>
+11 -20
View File
@@ -104,9 +104,6 @@ export default StyleSheet.create({
marginLeft: 10, marginLeft: 10,
marginTop: 6 marginTop: 6
}, },
homeView: {
marginHorizontal: 50,
},
button: { button: {
paddingVertical: 10, paddingVertical: 10,
paddingHorizontal: 20, paddingHorizontal: 20,
@@ -120,30 +117,24 @@ export default StyleSheet.create({
homeButtonText: { homeButtonText: {
color: fontOnPrimaryColor color: fontOnPrimaryColor
}, },
homeIconElement: { homeView: {
margin: 40,
},
homeDescriptionText: {
width: 200,
marginBottom: defaultBottomMargin,
},
homeElement: {
alignItems: 'center', alignItems: 'center',
marginTop: 15, marginBottom: 40,
flexDirection: 'row' flexDirection: 'row',
}, },
homeIconTextWrapper: { homeIconTextWrapper: {
alignItems: 'center', alignItems: 'center',
justifyContent: 'center', justifyContent: 'center',
marginBottom: 10,
}, },
wrapperCycle: { wrapperIcon: {
width: 80, width: 80,
height: 77,
position: 'absolute'
},
wrapperDrop: {
width: 81,
height: 85,
marginTop: 20,
position: 'absolute'
},
wrapperCircle: {
width: 80,
height: 80,
position: 'absolute' position: 'absolute'
}, },
homeCircle: { homeCircle: {