Re-add mucus icon

This commit is contained in:
Julia Friesel
2018-08-11 19:46:41 +02:00
parent d6cc8a7c14
commit 0afaf8e297
2 changed files with 19 additions and 15 deletions
+16 -12
View File
@@ -9,7 +9,6 @@ import { getOrCreateCycleDay } from '../../db'
import cycleModule from '../../lib/cycle'
import setUpFertilityStatusFunc from './nfp-lines'
import { horizontalGrid } from './y-axis'
// import slowlog from 'react-native-slowlog'
const getCycleDayNumber = cycleModule().getCycleDayNumber
const label = styles.column.label
@@ -18,7 +17,6 @@ const getFhmAndLtlInfo = setUpFertilityStatusFunc()
export default class DayColumn extends Component {
constructor(props) {
super(props)
// slowlog(this, /.*/, {threshold: 30})
}
makeDayColumn(data, index) {
const {
@@ -44,7 +42,7 @@ export default class DayColumn extends Component {
</Text>
)
const columnElements = []
if (bleeding) {
if (typeof bleeding === 'number') {
columnElements.push(
<Icon
name='drop'
@@ -57,6 +55,21 @@ export default class DayColumn extends Component {
/>
)
}
if (typeof mucus === 'number') {
console.log('ever')
const mucusIcon = (
<View
position='absolute'
top = {40}
left = {config.columnMiddle - styles.mucusIcon.width / 2}
{...styles.mucusIcon}
backgroundColor={styles.mucusIconShades[mucus]}
/>
)
columnElements.push(mucusIcon)
}
columnElements.push(cycleDayLabel, dateLabel, horizontalGrid)
if(nfpLineInfo.drawFhmLine) {
@@ -71,7 +84,6 @@ export default class DayColumn extends Component {
}
if(nfpLineInfo.drawLtlAt) {
console.log('yep')
const ltlLine = (<View
position = 'absolute'
width={'100%'}
@@ -84,15 +96,7 @@ export default class DayColumn extends Component {
if (y) {
columnElements.push(...this.drawDotAndLine(y, temperatureExclude, index))
}
// {cycleDay && cycleDay.mucus ?
// <Circle
// {...styles.mucusIcon}
// fill={styles.mucusIconShades[cycleDay.mucus.value]}
// /> : null}
// {y ?
// this.drawDotAndLines(y, cycleDay.temperature.exclude, index)
// : null} */}
return React.createElement(
TouchableOpacity,
+3 -3
View File
@@ -53,9 +53,9 @@ const styles = {
y: 3
},
mucusIcon: {
cx: config.columnWidth / 2,
cy: 50,
r: 10
width: 12,
height: 12,
borderRadius: 50,
},
mucusIconShades: [
'#cc99cc',