diff --git a/src/Calendar.style.js b/src/Calendar.style.js index d6dc1bd..cea61f3 100644 --- a/src/Calendar.style.js +++ b/src/Calendar.style.js @@ -63,7 +63,7 @@ export default StyleSheet.create({ dot: { width: 6, height: 6, - marginTop: 1, + marginTop: 0, borderRadius: 5, opacity: 0 }, @@ -71,7 +71,8 @@ export default StyleSheet.create({ // CALENDAR DOTS dotsContainer: { flexDirection: 'row', - justifyContent: 'center' + justifyContent: 'center', + height: 10 }, visibleDot: { opacity: 1, diff --git a/src/CalendarDay.js b/src/CalendarDay.js index fc46f71..a0e213a 100644 --- a/src/CalendarDay.js +++ b/src/CalendarDay.js @@ -6,7 +6,7 @@ import React, { Component } from "react"; import PropTypes from "prop-types"; import moment from "moment"; -import { Text, View, Animated, Easing, LayoutAnimation, TouchableOpacity } from "react-native"; +import { Text, View, Animated, Easing, LayoutAnimation, TouchableOpacity, Image } from "react-native"; import styles from "./Calendar.style.js"; class CalendarDay extends Component { @@ -288,33 +288,34 @@ class CalendarDay extends Component { } renderDots(marking) { - const baseDotStyle = [styles.dot, styles.visibleDot]; - const markedDatesStyle = this.props.markedDatesStyle || {}; - const formattedDate = this.props.date.format('YYYY-MM-DD'); - let validDots = ; // default empty view for no dots case + // const baseDotStyle = [styles.dot, styles.visibleDot]; + // const markedDatesStyle = this.props.markedDatesStyle || {}; + // const formattedDate = this.props.date.format('YYYY-MM-DD'); + // let validDots = ; // default empty view for no dots case // Filter dots and process only those which have color property - validDots = marking.dots - .filter(d => (d && d.color)) - .map((dot, index) => { - const selectedColor = dot.selectedColor || dot.selectedDotColor; // selectedDotColor deprecated - const backgroundColor = this.state.selected && selectedColor ? selectedColor : dot.color; - return ( - - ); - }); + // validDots = marking.dots + // .filter(d => (d && d.color)) + // .map((dot, index) => { + // const selectedColor = dot.selectedColor || dot.selectedDotColor; // selectedDotColor deprecated + // const backgroundColor = this.state.selected && selectedColor ? selectedColor : dot.color; + // return ( + // + // ); + // }); return ( - - {validDots} - + null +// +// +// ); } @@ -348,6 +349,19 @@ class CalendarDay extends Component { ); } + //Marked Text Styles + getMarkedTextStyles() { + if (!this.props.markedDates || this.props.markedDates.length === 0) { + return null; + } + const marking = this.state.marking; + if(marking.textStyle){ + return marking.textStyle; + }else{ + return null; + } + } + render() { // Defaults for disabled state const { @@ -460,7 +474,7 @@ class CalendarDay extends Component { > {showDayName && ( {date.format("ddd").toUpperCase()} @@ -471,7 +485,8 @@ class CalendarDay extends Component { diff --git a/src/img/heart.png b/src/img/heart.png new file mode 100644 index 0000000..f3f6e75 Binary files /dev/null and b/src/img/heart.png differ