Fix chart dots and lines
This commit is contained in:
@@ -7,7 +7,7 @@ import AppText from '../common/app-text'
|
||||
|
||||
import cycleModule from '../../lib/cycle'
|
||||
import { getOrdinalSuffix } from '../helpers/home'
|
||||
import { Containers, Typography } from '../../styles'
|
||||
import { Containers, Typography, Sizes } from '../../styles'
|
||||
|
||||
const CycleDayLabel = ({ height, date }) => {
|
||||
const cycleDayNumber = cycleModule().getCycleDayNumber(date)
|
||||
@@ -50,7 +50,7 @@ const styles = StyleSheet.create({
|
||||
},
|
||||
text: {
|
||||
...Typography.label,
|
||||
fontSize: 12
|
||||
fontSize: Sizes.small,
|
||||
},
|
||||
textBold: {
|
||||
...Typography.labelBold
|
||||
|
||||
@@ -40,14 +40,14 @@ export default class DotAndLine extends Component {
|
||||
const middleY = ((leftY - y) / 2) + y
|
||||
excludeLeftLine = leftTemperatureExclude || exclude
|
||||
lineLeft = new Path()
|
||||
.moveTo(CHART_COLUMN_MIDDLE - CHART_DOT_RADIUS, y)
|
||||
.moveTo(CHART_COLUMN_MIDDLE, y)
|
||||
.lineTo(0, middleY)
|
||||
}
|
||||
if (rightY) {
|
||||
const middleY = ((y - rightY) / 2) + rightY
|
||||
excludeRightLine = rightTemperatureExclude || exclude
|
||||
lineRight = new Path()
|
||||
.moveTo(CHART_COLUMN_MIDDLE + CHART_DOT_RADIUS, y)
|
||||
.moveTo(CHART_COLUMN_MIDDLE, y)
|
||||
.lineTo(CHART_COLUMN_WIDTH, middleY)
|
||||
}
|
||||
|
||||
@@ -74,7 +74,13 @@ export default class DotAndLine extends Component {
|
||||
strokeWidth={CHART_STROKE_WIDTH}
|
||||
key={y + CHART_DOT_RADIUS}
|
||||
/>
|
||||
<Shape d={dot} stroke={dotColor} strokeWidth={CHART_STROKE_WIDTH} key='dot' />
|
||||
<Shape
|
||||
d={dot}
|
||||
stroke={dotColor}
|
||||
strokeWidth={CHART_STROKE_WIDTH}
|
||||
fill="white"
|
||||
key='dot'
|
||||
/>
|
||||
</React.Fragment>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -28,13 +28,13 @@ Tick.propTypes = {
|
||||
|
||||
|
||||
const text = {
|
||||
right: 4,
|
||||
lineHeight: Sizes.base,
|
||||
textAlign: 'right',
|
||||
textAlignVertical: 'center'
|
||||
right: 4,
|
||||
textAlign: 'right'
|
||||
}
|
||||
const styles = StyleSheet.create({
|
||||
container: {
|
||||
justifyContent: 'center',
|
||||
position: 'absolute',
|
||||
right: 0,
|
||||
width: 40
|
||||
|
||||
Reference in New Issue
Block a user