From e51a99b8afbdff55474fe5837701486a7b46a67b Mon Sep 17 00:00:00 2001 From: Julia Friesel <julia.friesel@gmail.com> Date: Thu, 2 Aug 2018 09:44:40 +0200 Subject: [PATCH] Clean up line lengths in calendar --- components/calendar.js | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/components/calendar.js b/components/calendar.js index 4989d7f6..67e52997 100644 --- a/components/calendar.js +++ b/components/calendar.js @@ -1,27 +1,29 @@ import React, { Component } from 'react' import { View } from 'react-native' import { Calendar } from 'react-native-calendars' -import * as styles from '../styles/index' +import * as styles from '../styles' import { getOrCreateCycleDay, bleedingDaysSortedByDate } from '../db' export default class CalendarView extends Component { constructor(props) { super(props) - this.state = { bleedingDaysInCalFormat: getBleedingDaysInCalFormat(bleedingDaysSortedByDate) } + this.state = { + bleedingDaysInCalFormat: toCalFormat(bleedingDaysSortedByDate) + } - this.setStateWithCalendarFormattedDays = (function (CalendarComponent) { + this.setStateWithCalFormattedDays = (function (CalendarComponent) { return function() { CalendarComponent.setState({ - bleedingDaysInCalFormat: getBleedingDaysInCalFormat(bleedingDaysSortedByDate) + bleedingDaysInCalFormat: toCalFormat(bleedingDaysSortedByDate) }) } })(this) - bleedingDaysSortedByDate.addListener(this.setStateWithCalendarFormattedDays) + bleedingDaysSortedByDate.addListener(this.setStateWithCalFormattedDays) } componentWillUnmount() { - bleedingDaysSortedByDate.removeListener(this.setStateWithCalendarFormattedDays) + bleedingDaysSortedByDate.removeListener(this.setStateWithCalFormattedDays) } passDateToDayView(result) { @@ -43,10 +45,14 @@ export default class CalendarView extends Component { } } -function getBleedingDaysInCalFormat(bleedingDaysSortedByDate) { +function toCalFormat(bleedingDaysSortedByDate) { const shadesOfRed = ['#ffbaba', '#ff7b7b', '#ff5252', '#ff0000'] return bleedingDaysSortedByDate.reduce((acc, day) => { - acc[day.date] = { startingDay: true, endingDay: true, color: shadesOfRed[day.bleeding.value] } + acc[day.date] = { + startingDay: true, + endingDay: true, + color: shadesOfRed[day.bleeding.value] + } return acc }, {}) } \ No newline at end of file -- GitLab