Skip to content
Snippets Groups Projects
Commit 0afaf8e2 authored by Julia Friesel's avatar Julia Friesel
Browse files

Re-add mucus icon

parent d6cc8a7c
No related branches found
No related tags found
No related merge requests found
...@@ -9,7 +9,6 @@ import { getOrCreateCycleDay } from '../../db' ...@@ -9,7 +9,6 @@ import { getOrCreateCycleDay } from '../../db'
import cycleModule from '../../lib/cycle' import cycleModule from '../../lib/cycle'
import setUpFertilityStatusFunc from './nfp-lines' import setUpFertilityStatusFunc from './nfp-lines'
import { horizontalGrid } from './y-axis' import { horizontalGrid } from './y-axis'
// import slowlog from 'react-native-slowlog'
const getCycleDayNumber = cycleModule().getCycleDayNumber const getCycleDayNumber = cycleModule().getCycleDayNumber
const label = styles.column.label const label = styles.column.label
...@@ -18,7 +17,6 @@ const getFhmAndLtlInfo = setUpFertilityStatusFunc() ...@@ -18,7 +17,6 @@ const getFhmAndLtlInfo = setUpFertilityStatusFunc()
export default class DayColumn extends Component { export default class DayColumn extends Component {
constructor(props) { constructor(props) {
super(props) super(props)
// slowlog(this, /.*/, {threshold: 30})
} }
makeDayColumn(data, index) { makeDayColumn(data, index) {
const { const {
...@@ -44,7 +42,7 @@ export default class DayColumn extends Component { ...@@ -44,7 +42,7 @@ export default class DayColumn extends Component {
</Text> </Text>
) )
const columnElements = [] const columnElements = []
if (bleeding) { if (typeof bleeding === 'number') {
columnElements.push( columnElements.push(
<Icon <Icon
name='drop' name='drop'
...@@ -57,6 +55,21 @@ export default class DayColumn extends Component { ...@@ -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) columnElements.push(cycleDayLabel, dateLabel, horizontalGrid)
if(nfpLineInfo.drawFhmLine) { if(nfpLineInfo.drawFhmLine) {
...@@ -71,7 +84,6 @@ export default class DayColumn extends Component { ...@@ -71,7 +84,6 @@ export default class DayColumn extends Component {
} }
if(nfpLineInfo.drawLtlAt) { if(nfpLineInfo.drawLtlAt) {
console.log('yep')
const ltlLine = (<View const ltlLine = (<View
position = 'absolute' position = 'absolute'
width={'100%'} width={'100%'}
...@@ -84,15 +96,7 @@ export default class DayColumn extends Component { ...@@ -84,15 +96,7 @@ export default class DayColumn extends Component {
if (y) { if (y) {
columnElements.push(...this.drawDotAndLine(y, temperatureExclude, index)) 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( return React.createElement(
TouchableOpacity, TouchableOpacity,
......
...@@ -53,9 +53,9 @@ const styles = { ...@@ -53,9 +53,9 @@ const styles = {
y: 3 y: 3
}, },
mucusIcon: { mucusIcon: {
cx: config.columnWidth / 2, width: 12,
cy: 50, height: 12,
r: 10 borderRadius: 50,
}, },
mucusIconShades: [ mucusIconShades: [
'#cc99cc', '#cc99cc',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment