Fix: Middle chart legend improved;
Row height halfed, elements aligned, fontsize partially decreased
This commit is contained in:
@@ -4,15 +4,19 @@ import { StyleSheet, View } from 'react-native'
|
|||||||
|
|
||||||
import AppText from '../common/app-text'
|
import AppText from '../common/app-text'
|
||||||
|
|
||||||
import { Typography } from '../../styles'
|
import { Sizes, Typography } from '../../styles'
|
||||||
import { CHART_YAXIS_WIDTH } from '../../config'
|
import { CHART_YAXIS_WIDTH } from '../../config'
|
||||||
import { shared as labels } from '../../i18n/en/labels'
|
import { shared as labels } from '../../i18n/en/labels'
|
||||||
|
|
||||||
const ChartLegend = ({ height }) => {
|
const ChartLegend = ({ height }) => {
|
||||||
return (
|
return (
|
||||||
<View style={[styles.container, { height }]}>
|
<View style={[styles.container, { height }]}>
|
||||||
<AppText style={styles.textBold}>#</AppText>
|
<View style={[styles.singleLabelContainer, { height: height / 2 }]}>
|
||||||
<AppText style={styles.text}>{labels.date}</AppText>
|
<AppText style={styles.textBold}>#</AppText>
|
||||||
|
</View>
|
||||||
|
<View style={[styles.singleLabelContainer, { height: height / 2 }]}>
|
||||||
|
<AppText style={styles.text}>{labels.date}</AppText>
|
||||||
|
</View>
|
||||||
</View>
|
</View>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
@@ -27,8 +31,13 @@ const styles = StyleSheet.create({
|
|||||||
justifyContent: 'flex-end',
|
justifyContent: 'flex-end',
|
||||||
width: CHART_YAXIS_WIDTH,
|
width: CHART_YAXIS_WIDTH,
|
||||||
},
|
},
|
||||||
|
singleLabelContainer: {
|
||||||
|
justifyContent: 'space-around',
|
||||||
|
alignItems: 'center',
|
||||||
|
},
|
||||||
text: {
|
text: {
|
||||||
...Typography.label,
|
...Typography.label,
|
||||||
|
fontSize: Sizes.footnote,
|
||||||
},
|
},
|
||||||
textBold: {
|
textBold: {
|
||||||
...Typography.labelBold,
|
...Typography.labelBold,
|
||||||
|
|||||||
@@ -19,11 +19,20 @@ const CycleDayLabel = ({ height, date }) => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<View style={[styles.container, { height }]}>
|
<View style={[styles.container, { height }]}>
|
||||||
<AppText style={styles.textBold}>{cycleDayLabel}</AppText>
|
<View style={{ ...styles.labelRow, height: height / 2 }}>
|
||||||
<View style={styles.dateLabel}>
|
<AppText style={styles.textBold}>{cycleDayLabel}</AppText>
|
||||||
<AppText style={styles.text}>
|
</View>
|
||||||
{isFirstDayOfMonth ? momentDate.format('MMM') : dayOfMonth}
|
|
||||||
</AppText>
|
<View style={{ ...styles.labelRow, height: height / 2 }}>
|
||||||
|
{isFirstDayOfMonth && (
|
||||||
|
<AppText style={styles.textFootnote}>
|
||||||
|
{momentDate.format('MMM')}
|
||||||
|
</AppText>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{!isFirstDayOfMonth && (
|
||||||
|
<AppText style={styles.textSmall}>{dayOfMonth}</AppText>
|
||||||
|
)}
|
||||||
{!isFirstDayOfMonth && (
|
{!isFirstDayOfMonth && (
|
||||||
<AppText style={styles.textLight}>
|
<AppText style={styles.textLight}>
|
||||||
{getOrdinalSuffix(dayOfMonth)}
|
{getOrdinalSuffix(dayOfMonth)}
|
||||||
@@ -45,17 +54,21 @@ const styles = StyleSheet.create({
|
|||||||
justifyContent: 'flex-end',
|
justifyContent: 'flex-end',
|
||||||
left: 4,
|
left: 4,
|
||||||
},
|
},
|
||||||
text: {
|
textSmall: {
|
||||||
...Typography.label,
|
...Typography.label,
|
||||||
fontSize: Sizes.small,
|
fontSize: Sizes.small,
|
||||||
},
|
},
|
||||||
|
textFootnote: {
|
||||||
|
...Typography.label,
|
||||||
|
fontSize: Sizes.footnote,
|
||||||
|
},
|
||||||
textBold: {
|
textBold: {
|
||||||
...Typography.labelBold,
|
...Typography.labelBold,
|
||||||
},
|
},
|
||||||
textLight: {
|
textLight: {
|
||||||
...Typography.labelLight,
|
...Typography.labelLight,
|
||||||
},
|
},
|
||||||
dateLabel: {
|
labelRow: {
|
||||||
flexDirection: 'row',
|
flexDirection: 'row',
|
||||||
justifyContent: 'space-around',
|
justifyContent: 'space-around',
|
||||||
alignItems: 'center',
|
alignItems: 'center',
|
||||||
|
|||||||
Reference in New Issue
Block a user