@@ -11,51 +11,69 @@ import UIKit
1111private let reuseIdentifier = " Cell "
1212
1313@objc public protocol EPCalendarPickerDelegate {
14-
1514 optional func epCalendarPicker( _: EPCalendarPicker , didCancel error : NSError )
1615 optional func epCalendarPicker( _: EPCalendarPicker , didSelectDate date : NSDate )
1716 optional func epCalendarPicker( _: EPCalendarPicker , didSelectMultipleDate dates : [ NSDate ] )
18-
1917}
2018
21-
2219public class EPCalendarPicker : UICollectionViewController {
2320
2421 public var calendarDelegate : EPCalendarPickerDelegate ?
2522 public var multiSelectEnabled : Bool
2623 public var showsTodaysButton : Bool = true
2724 private var arrSelectedDates = [ NSDate] ( )
2825 public var tintColor : UIColor
26+
27+ public var dayDisabledTintColor : UIColor
2928 public var weekdayTintColor : UIColor
3029 public var weekendTintColor : UIColor
3130 public var todayTintColor : UIColor
3231 public var dateSelectionColor : UIColor
3332 public var monthTitleColor : UIColor
3433
34+ // new options
35+ public var startDate : NSDate ?
36+ public var hightlightsToday : Bool = true
37+ public var hideDaysFromOtherMonth : Bool = false
38+ public var barTintColor : UIColor
39+
40+ public var backgroundImage : UIImage ?
41+ public var backgroundColor : UIColor ?
3542
3643 private( set) public var startYear : Int
3744 private( set) public var endYear : Int
3845
3946 override public func viewDidLoad( ) {
4047 super. viewDidLoad ( )
41- self . title = " Date Picker "
42- self . collectionView? . delegate = self
43- self . collectionView? . backgroundColor = UIColor . whiteColor ( )
48+
49+ // setup Navigationbar
4450 self . navigationController? . navigationBar. tintColor = self . tintColor
51+ self . navigationController? . navigationBar. barTintColor = self . barTintColor
52+ self . navigationController? . navigationBar. titleTextAttributes = [ NSForegroundColorAttributeName: self . tintColor]
53+
54+ // setup collectionview
55+ self . collectionView? . delegate = self
56+ self . collectionView? . backgroundColor = UIColor . clearColor ( )
4557 self . collectionView? . showsHorizontalScrollIndicator = false
4658 self . collectionView? . showsVerticalScrollIndicator = false
4759
48-
4960 // Register cell classes
5061 self . collectionView!. registerNib ( UINib ( nibName: " EPCalendarCell1 " , bundle: NSBundle ( forClass: EPCalendarPicker . self ) ) , forCellWithReuseIdentifier: reuseIdentifier)
62+ self . collectionView!. registerNib ( UINib ( nibName: " EPCalendarHeaderView " , bundle: NSBundle ( forClass: EPCalendarPicker . self ) ) , forSupplementaryViewOfKind: UICollectionElementKindSectionHeader, withReuseIdentifier: " Header " )
5163
52- self . collectionView!. registerNib ( UINib ( nibName: " EPCalendarHeaderView " , bundle: NSBundle ( forClass: EPCalendarPicker . self ) ) , forSupplementaryViewOfKind: UICollectionElementKindSectionHeader, withReuseIdentifier: " Header " )
5364 inititlizeBarButtons ( )
5465
5566 dispatch_async ( dispatch_get_main_queue ( ) ) { ( ) -> Void in
5667 self . scrollToToday ( )
5768 }
58- // Do any additional setup after loading the view.
69+
70+ if backgroundImage != nil {
71+ self . collectionView!. backgroundView = UIImageView ( image: backgroundImage)
72+ } else if backgroundColor != nil {
73+ self . collectionView? . backgroundColor = backgroundColor
74+ } else {
75+ self . collectionView? . backgroundColor = UIColor . whiteColor ( )
76+ }
5977 }
6078
6179
@@ -113,6 +131,8 @@ public class EPCalendarPicker: UICollectionViewController {
113131
114132 //Text color initializations
115133 self . tintColor = EPDefaults . tintColor
134+ self . barTintColor = EPDefaults . barTintColor
135+ self . dayDisabledTintColor = EPDefaults . dayDisabledTintColor
116136 self . weekdayTintColor = EPDefaults . weekdayTintColor
117137 self . weekendTintColor = EPDefaults . weekendTintColor
118138 self . dateSelectionColor = EPDefaults . dateSelectionColor
@@ -129,7 +149,6 @@ public class EPCalendarPicker: UICollectionViewController {
129149 self . arrSelectedDates. appendContentsOf ( selectedDates!)
130150 }
131151 super. init ( collectionViewLayout: layout)
132-
133152 }
134153
135154
@@ -193,22 +212,37 @@ public class EPCalendarPicker: UICollectionViewController {
193212 }
194213 if ( currentDate > nextMonthFirstDay) {
195214 cell. isCellSelectable = false
196- cell. lblDay. textColor = EPColors . LightGrayColor
215+ if hideDaysFromOtherMonth {
216+ cell. lblDay. textColor = UIColor . clearColor ( )
217+ } else {
218+ cell. lblDay. textColor = self . dayDisabledTintColor
219+ }
197220 }
198- if currentDate. isToday ( ) {
221+ if currentDate. isToday ( ) && hightlightsToday {
199222 cell. setTodayCellColor ( todayTintColor)
200223 }
201224
225+ if startDate != nil {
226+ if NSCalendar . currentCalendar ( ) . startOfDayForDate ( cell. currentDate) < NSCalendar . currentCalendar ( ) . startOfDayForDate ( startDate!) {
227+ cell. isCellSelectable = false
228+ cell. lblDay. textColor = self . dayDisabledTintColor
229+ }
230+ }
202231 }
203232 }
204233 else {
205234 cell. isCellSelectable = false
206235 let previousDay = firstDayOfThisMonth. dateByAddingDays ( - ( prefixDays - indexPath. row) )
207236 cell. currentDate = previousDay
208237 cell. lblDay. text = " \( previousDay. day ( ) ) "
209- cell. lblDay. textColor = EPColors . LightGrayColor
210- cell. lblDay. layer. backgroundColor = UIColor . whiteColor ( ) . CGColor
238+ if hideDaysFromOtherMonth {
239+ cell. lblDay. textColor = UIColor . clearColor ( )
240+ } else {
241+ cell. lblDay. textColor = self . dayDisabledTintColor
242+ }
211243 }
244+
245+ cell. backgroundColor = UIColor . clearColor ( )
212246 return cell
213247 }
214248
@@ -238,11 +272,12 @@ public class EPCalendarPicker: UICollectionViewController {
238272 header. lblTitle. textColor = monthTitleColor
239273 header. updateWeekdaysLabelColor ( weekdayTintColor)
240274 header. updateWeekendLabelColor ( weekendTintColor)
275+ header. backgroundColor = UIColor . clearColor ( )
276+
241277 return header;
242278 }
243279
244280 return UICollectionReusableView ( )
245-
246281 }
247282
248283 override public func collectionView( collectionView: UICollectionView , didSelectItemAtIndexPath indexPath: NSIndexPath ) {
@@ -274,7 +309,7 @@ public class EPCalendarPicker: UICollectionViewController {
274309 else {
275310 cell. deSelectedForLabelColor ( weekdayTintColor)
276311 }
277- if cell. currentDate. isToday ( ) {
312+ if cell. currentDate. isToday ( ) && hightlightsToday {
278313 cell. setTodayCellColor ( todayTintColor)
279314 }
280315 }
0 commit comments