Merge branch 'use-icon-font-for-home-icons' into 'master'

Use icon font for home icons

See merge request bloodyhealth/drip!115
This commit is contained in:
Julia Friesel
2018-12-06 08:31:20 +00:00
14 changed files with 70 additions and 61 deletions
+7 -11
View File
@@ -2,18 +2,18 @@ import React, { Component } from 'react'
import { View, FlatList, ActivityIndicator } from 'react-native'
import range from 'date-range'
import { LocalDate } from 'js-joda'
import { Surface } from 'react-native/Libraries/ART/ReactNativeART'
import { makeYAxisLabels, makeHorizontalGrid } from './y-axis'
import nfpLines from './nfp-lines'
import DayColumn from './day-column'
import { getCycleDaysSortedByDate, getAmountOfCycleDays } from '../../db'
import styles from './styles'
import { cycleDayColor } from '../../styles'
import { scaleObservable } from '../../local-storage'
import config from '../../config'
import AppText from '../app-text'
import { shared as labels } from '../../i18n/en/labels'
import DripIcon from '../../assets/drip-icons'
import CycleDayIcon from '../../assets/home-circle'
import DripHomeIcon from '../../assets/drip-home-icons'
import nothingChanged from '../../db/db-unchanged'
const symptomIcons = {
@@ -163,15 +163,11 @@ export default class CycleChart extends Component {
{makeYAxisLabels(this.columnHeight)}
</View>
<View style={[styles.yAxis, { alignItems: 'center', justifyContent: 'center' }]}>
<Surface
width={styles.yAxis.width * 0.8}
height={styles.yAxis.width * 0.8}
>
<CycleDayIcon
strokeWidth={10}
scale={0.12}
/>
</Surface>
<DripHomeIcon
name="circle"
size={styles.yAxis.width - 7}
color={cycleDayColor}
/>
<AppText style={[
styles.column.label.date,
styles.yAxisLabels.dateLabel