From 0afaf8e2973ed63755a1f1d6460d4752e70f54c0 Mon Sep 17 00:00:00 2001
From: Julia Friesel <julia.friesel@gmail.com>
Date: Sat, 11 Aug 2018 19:46:41 +0200
Subject: [PATCH] Re-add mucus icon
---
components/chart/day-column.js | 30 +++++++++++++++++-------------
components/chart/styles.js | 6 +++---
2 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/components/chart/day-column.js b/components/chart/day-column.js
index bc459524..419042de 100644
--- a/components/chart/day-column.js
+++ b/components/chart/day-column.js
@@ -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,
diff --git a/components/chart/styles.js b/components/chart/styles.js
index 7b8a72e1..6f474e0e 100644
--- a/components/chart/styles.js
+++ b/components/chart/styles.js
@@ -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',
--
GitLab