Merge pull request #258 from sochalewski/master

fillColor delegate method for unselected dates (cells)
WenchaoD · Apr 8, 2016 · 8b17ec9 · 8b17ec9 · SuEric · Apr 9, 2016
2 parents d55e443 + ba2c8f7
commit 8b17ec9
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 2 deletions.
diff --git a/FSCalendar/FSCalendar.h b/FSCalendar/FSCalendar.h
@@ -154,6 +154,11 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (nullable UIColor *)calendar:(FSCalendar *)calendar appearance:(FSCalendarAppearance *)appearance selectionColorForDate:(NSDate *)date;
 
+/**
+ * Asks the delegate for a fill color in unselected state for the specific date.
+ */
+- (nullable UIColor *)calendar:(FSCalendar *)calendar appearance:(FSCalendarAppearance *)appearance fillColorForDate:(NSDate *)date;
+
 /**
  * Asks the delegate for day text color in unselected state for the specific date.
  */

diff --git a/FSCalendar/FSCalendar.m b/FSCalendar/FSCalendar.m
@@ -1492,6 +1492,7 @@ - (void)invalidateHeaders
 - (void)invalidateAppearanceForCell:(FSCalendarCell *)cell
 {
     cell.preferredSelectionColor = [self preferredSelectionColorForDate:cell.date];
+    cell.preferredFillColor = [self preferredFillColorForDate:cell.date];
     cell.preferredTitleDefaultColor = [self preferredTitleDefaultColorForDate:cell.date];
     cell.preferredTitleSelectionColor = [self preferredTitleSelectionColorForDate:cell.date];
     if (cell.subtitle) {
@@ -1701,6 +1702,15 @@ - (UIColor *)preferredSelectionColorForDate:(NSDate *)date
     return nil;
 }
 
+- (UIColor *)preferredFillColorForDate:(NSDate *)date
+{
+    if (self.delegateAppearance && [self.delegateAppearance respondsToSelector:@selector(calendar:appearance:fillColorForDate:)]) {
+        UIColor *color = [self.delegateAppearance calendar:self appearance:self.appearance fillColorForDate:date];
+        return color;
+    }
+    return nil;
+}
+
 - (UIColor *)preferredTitleDefaultColorForDate:(NSDate *)date
 {
     if (self.delegateAppearance && [self.delegateAppearance respondsToSelector:@selector(calendar:appearance:titleDefaultColorForDate:)]) {

diff --git a/FSCalendar/FSCalendarCell.h b/FSCalendar/FSCalendarCell.h
@@ -36,6 +36,7 @@
 @property (readonly, nonatomic) BOOL weekend;
 
 @property (strong, nonatomic) UIColor *preferredSelectionColor;
+@property (strong, nonatomic) UIColor *preferredFillColor;
 @property (strong, nonatomic) UIColor *preferredTitleDefaultColor;
 @property (strong, nonatomic) UIColor *preferredTitleSelectionColor;
 @property (strong, nonatomic) UIColor *preferredSubtitleDefaultColor;

diff --git a/FSCalendar/FSCalendarCell.m b/FSCalendar/FSCalendarCell.m
@@ -187,7 +187,9 @@ - (void)configureCell
     }
 
     UIColor *borderColor = self.colorForCellBorder;
-    BOOL shouldHiddenBackgroundLayer = !self.selected && !self.dateIsToday && !self.dateIsSelected && !borderColor;
+    UIColor *fillColor = self.colorForBackgroundLayer;
+
+    BOOL shouldHiddenBackgroundLayer = !self.selected && !self.dateIsToday && !self.dateIsSelected && !borderColor && !fillColor;
 
     if (_backgroundLayer.hidden != shouldHiddenBackgroundLayer) {
         _backgroundLayer.hidden = shouldHiddenBackgroundLayer;
@@ -304,8 +306,9 @@ - (UIColor *)colorForBackgroundLayer
 {
     if (self.dateIsSelected || self.isSelected) {
         return self.preferredSelectionColor ?: [self colorForCurrentStateInDictionary:_appearance.backgroundColors];
+    } else {
+        return self.preferredFillColor ?: [self colorForCurrentStateInDictionary:_appearance.backgroundColors];
     }
-    return [self colorForCurrentStateInDictionary:_appearance.backgroundColors];
 }
 
 - (UIColor *)colorForTitleLabel