Merge branch 'master'

components/chart/day-column.js

@@ -29,6 +29,7 @@ export default class DayColumn extends Component {
       temperatureExclude,
       bleeding,
       mucus,
+      cervix,
       drawFhmLine,
       drawLtlAt,
       rightY,
@@ -135,4 +136,4 @@ export default class DayColumn extends Component {
       </View>
     )
   }
-}
+}

components/chart/styles.js

@@ -61,6 +61,11 @@ const styles = {
     '#a64ca6',
     '#993299'
   ],
+  cervixIcon: {
+    width: 12,
+    height: 12,
+    borderRadius: 50
+  },
   yAxis: {
     width: config.columnWidth,
     borderRightWidth: 0.5,

components/home.js

@@ -8,7 +8,7 @@ import {
 import { LocalDate, ChronoUnit } from 'js-joda'
 import styles from '../styles/index'
 import cycleModule from '../lib/cycle'
-import { getOrCreateCycleDay, bleedingDaysSortedByDate, fillWithDummyData, deleteAll } from '../db'
+import { getOrCreateCycleDay, bleedingDaysSortedByDate, fillWithMucusDummyData, fillWithCervixDummyData, deleteAll } from '../db'
 import {bleedingPrediction as labels} from './labels'
 
 const getCycleDayNumber = cycleModule().getCycleDayNumber
@@ -62,8 +62,14 @@ export default class Home extends Component {
           </View>
           <View style={styles.homeButton}>
             <Button
-              onPress={() => fillWithDummyData()}
-              title="fill with example data">
+              onPress={() => fillWithMucusDummyData()}
+              title="fill with example data for mucus&temp">
+            </Button>
+          </View>
+          <View style={styles.homeButton}>
+            <Button
+              onPress={() => fillWithCervixDummyData()}
+              title="fill with example data for cervix&temp">
             </Button>
           </View>
           <View style={styles.homeButton}>
@@ -107,4 +113,4 @@ function determinePredictionText() {
   } else {
     return labels.predictionStartedXDaysLeft(daysToEnd)
   }
-}
+}