Re-add fhm line

components/chart/chart.js

@@ -10,21 +10,6 @@ import config from './config'
 
 const yAxisView = <View {...styles.yAxis}>{yAxis.labels}</View>
 
-function getInfoForNeighborColumns(index, cols) {
-  const ret = {}
-  const right = index > 0 ? cols[index - 1] : undefined
-  const left = index < cols.length - 1 ? cols[index + 1] : undefined
-  if (right && right.y) {
-    ret.rightY = right.y
-    ret.rightTemperatureExclude = right.temperatureExclude
-  }
-  if (left && left.y) {
-    ret.leftY = left.y
-    ret.leftTemperatureExclude = left.temperatureExclude
-  }
-  return ret
-}
-
 export default class CycleChart extends Component {
   constructor(props) {
     super(props)
@@ -110,3 +95,18 @@ function getPreviousDays(n) {
 
   return range(earlierDate, today).reverse()
 }
+
+function getInfoForNeighborColumns(index, cols) {
+  const ret = {}
+  const right = index > 0 ? cols[index - 1] : undefined
+  const left = index < cols.length - 1 ? cols[index + 1] : undefined
+  if (right && right.y) {
+    ret.rightY = right.y
+    ret.rightTemperatureExclude = right.temperatureExclude
+  }
+  if (left && left.y) {
+    ret.leftY = left.y
+    ret.leftTemperatureExclude = left.temperatureExclude
+  }
+  return ret
+}

components/chart/config.js

@@ -3,7 +3,7 @@ const config = {
   columnWidth: 30,
   temperatureScale: {
     low: 35,
-    high: 40
+    high: 38
   },
   xAxisRangeInDays: 1000
 }

components/chart/day-column.js

@@ -9,7 +9,7 @@ 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'
+// import slowlog from 'react-native-slowlog'
 
 const getCycleDayNumber = cycleModule().getCycleDayNumber
 const label = styles.column.label
@@ -18,7 +18,7 @@ const getFhmAndLtlInfo = setUpFertilityStatusFunc()
 export default class DayColumn extends Component {
   constructor(props) {
     super(props)
-    //slowlog(this, /.*/, {threshold: 30})
+    // slowlog(this, /.*/, {threshold: 30})
   }
   makeDayColumn(data, index) {
     const {
@@ -58,22 +58,18 @@ export default class DayColumn extends Component {
       )
     }
     columnElements.push(cycleDayLabel, dateLabel, horizontalGrid)
-    //   {nfpLineInfo.drawFhmLine ?
-    //     <Line
-    //       x1={0 + styles.nfpLine.strokeWidth / 2}
-    //       y1="20"
-    //       x2={0 + styles.nfpLine.strokeWidth / 2}
-    //       y2={config.chartHeight - 20}
-    //       {...styles.nfpLine}
-    //     /> : null}
-    // />)
 
-    //     <Path {...styles.bleedingIcon}
+    if(nfpLineInfo.drawFhmLine) {
-    //       d="M15 3
+      console.log('jappens')
-    //         Q16.5 6.8 25 18
+      const fhmLine = (<View
-    //         A12.8 12.8 0 1 1 5 18
+        position = 'absolute'
-    //         Q13.5 6.8 15 3z" />
+        top={100}
-    //     : null}
+        width={styles.nfpLine.strokeWidth}
+        height={200}
+        {...styles.nfpLine}
+      />)
+      columnElements.push(fhmLine)
+    }
 
     //   {nfpLineInfo.drawLtlAt ?
     //     <Line
@@ -105,8 +101,7 @@ export default class DayColumn extends Component {
         onPress: () => {
           this.passDateToDayView(dateString)
         },
-        activeOpacity: 0.,
+        activeOpacity: 0.8
-        
       },
       columnElements
     )

components/chart/styles.js

@@ -82,7 +82,7 @@ const styles = {
     borderStyle: 'solid'
   },
   nfpLine: {
-    stroke: '#00b159',
+    backgroundColor: '#00b159',
     strokeWidth: 3
   }
 }