Skip to content

Added selectedStartDate and selectedEndDate listeners #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Ljuka wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Added selectedStartDate and selectedEndDate listeners #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d61ff4e
Added selectedStartDate and selectedEndDate listeners
Ljuka Sep 27, 2018
901238a
Enabling some fonts and colors to be customized
Ljuka Sep 28, 2018
67334c3
Added variables for changing highlighted labels in date range
Ljuka Oct 24, 2018
4de6a3f
Added optional parameter for disabled dates
Ljuka Oct 27, 2018
fb458d3
Update to swift 4.2
Ljuka Oct 27, 2018
30807b3
Making code more objc friendly
Ljuka Oct 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 32 additions & 20 deletions CalendarDateRangePickerViewController/Classes/CalendarDateRangePickerCell.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,25 @@ import UIKit
class CalendarDateRangePickerCell: UICollectionViewCell {

private let defaultTextColor = UIColor.darkGray
private let highlightedColor = UIColor(white: 0.9, alpha: 1.0)
var highlightedColor = UIColor(white: 0.9, alpha: 1.0)
private let disabledColor = UIColor.lightGray
var font = UIFont(name: "HelveticaNeue", size: CalendarDateRangePickerViewController.defaultCellFontSize) {
didSet {
label?.font = font
}
}

var selectedColor: UIColor!

var date: Date?
var selectedView: UIView?
var halfBackgroundView: UIView?
var roundHighlightView: UIView?
@objc var selectedColor: UIColor!
@objc var selectedLabelColor: UIColor!
@objc var highlightedLabelColor: UIColor!
@objc var disabledDates: [Date]!
@objc var disabledTimestampDates: [Int]?
@objc var date: Date?
@objc var selectedView: UIView?
@objc var halfBackgroundView: UIView?
@objc var roundHighlightView: UIView?

var label: UILabel!
@objc var label: UILabel!

override init(frame: CGRect) {
super.init(frame: frame)
Expand All @@ -33,16 +41,16 @@ class CalendarDateRangePickerCell: UICollectionViewCell {
initLabel()
}

func initLabel() {
@objc func initLabel() {
label = UILabel(frame: frame)
label.center = CGPoint(x: frame.size.width / 2, y: frame.size.height / 2)
label.font = UIFont(name: "HelveticaNeue", size: 15.0)
label.font = font
label.textColor = UIColor.darkGray
label.textAlignment = NSTextAlignment.center
self.addSubview(label)
}

func reset() {
@objc func reset() {
self.backgroundColor = UIColor.clear
label.textColor = defaultTextColor
label.backgroundColor = UIColor.clear
Expand All @@ -60,7 +68,7 @@ class CalendarDateRangePickerCell: UICollectionViewCell {
}
}

func select() {
@objc func select() {
let width = self.frame.size.width
let height = self.frame.size.height
selectedView = UIView(frame: CGRect(x: (width - height) / 2, y: 0, width: height, height: height))
Expand All @@ -69,34 +77,35 @@ class CalendarDateRangePickerCell: UICollectionViewCell {
self.addSubview(selectedView!)
self.sendSubview(toBack: selectedView!)

label.textColor = UIColor.white
label.textColor = selectedLabelColor
}

func highlightRight() {
@objc func highlightRight() {
// This is used instead of highlight() when we need to highlight cell with a rounded edge on the left
let width = self.frame.size.width
let height = self.frame.size.height
halfBackgroundView = UIView(frame: CGRect(x: width / 2, y: 0, width: width / 2, height: height))
halfBackgroundView?.backgroundColor = highlightedColor
self.addSubview(halfBackgroundView!)
self.sendSubview(toBack: halfBackgroundView!)

label.textColor = highlightedLabelColor
addRoundHighlightView()
}

func highlightLeft() {
@objc func highlightLeft() {
// This is used instead of highlight() when we need to highlight the cell with a rounded edge on the right
let width = self.frame.size.width
let height = self.frame.size.height
halfBackgroundView = UIView(frame: CGRect(x: 0, y: 0, width: width / 2, height: height))
halfBackgroundView?.backgroundColor = highlightedColor
self.addSubview(halfBackgroundView!)
self.sendSubview(toBack: halfBackgroundView!)

label.textColor = highlightedLabelColor

addRoundHighlightView()
}

func addRoundHighlightView() {
@objc func addRoundHighlightView() {
let width = self.frame.size.width
let height = self.frame.size.height
roundHighlightView = UIView(frame: CGRect(x: (width - height) / 2, y: 0, width: height, height: height))
Expand All @@ -106,12 +115,15 @@ class CalendarDateRangePickerCell: UICollectionViewCell {
self.sendSubview(toBack: roundHighlightView!)
}

func highlight() {
@objc func highlight() {
self.backgroundColor = highlightedColor
label.textColor = highlightedLabelColor

}

func disable() {
@objc func disable() {
label.textColor = disabledColor

}

}
12 changes: 9 additions & 3 deletions CalendarDateRangePickerViewController/Classes/CalendarDateRangePickerHeaderView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,12 @@ import UIKit

class CalendarDateRangePickerHeaderView: UICollectionReusableView {

var label: UILabel!
@objc var label: UILabel!
@objc var font = UIFont(name: "HelveticaNeue-Light", size: CalendarDateRangePickerViewController.defaultHeaderFontSize) {
didSet {
label?.font = font
}
}

override init(frame: CGRect) {
super.init(frame: frame)
Expand All @@ -22,13 +27,14 @@ class CalendarDateRangePickerHeaderView: UICollectionReusableView {
initLabel()
}

func initLabel() {
@objc func initLabel() {
label = UILabel(frame: frame)
label.center = CGPoint(x: frame.size.width / 2, y: frame.size.height / 2)
label.font = UIFont(name: "HelveticaNeue-Light", size: 17.0)
label.font = font
label.textColor = UIColor.darkGray
label.textAlignment = NSTextAlignment.center
self.addSubview(label)
}

}

126 changes: 101 additions & 25 deletions CalendarDateRangePickerViewController/Classes/CalendarDateRangePickerViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,27 +11,42 @@ import UIKit
public protocol CalendarDateRangePickerViewControllerDelegate {
func didCancelPickingDateRange()
func didPickDateRange(startDate: Date!, endDate: Date!)
func didSelectStartDate(startDate: Date!)
func didSelectEndDate(endDate: Date!)
}

public class CalendarDateRangePickerViewController: UICollectionViewController {

let cellReuseIdentifier = "CalendarDateRangePickerCell"
let headerReuseIdentifier = "CalendarDateRangePickerHeaderView"
@objc let cellReuseIdentifier = "CalendarDateRangePickerCell"
@objc let headerReuseIdentifier = "CalendarDateRangePickerHeaderView"

public var delegate: CalendarDateRangePickerViewControllerDelegate!

let itemsPerRow = 7
let itemHeight: CGFloat = 40
let collectionViewInsets = UIEdgeInsets(top: 0, left: 25, bottom: 0, right: 25)
@objc let itemsPerRow = 7
@objc let itemHeight: CGFloat = 40
@objc let collectionViewInsets = UIEdgeInsets(top: 0, left: 25, bottom: 0, right: 25)

public var minimumDate: Date!
public var maximumDate: Date!
@objc public var minimumDate: Date!
@objc public var maximumDate: Date!

public var selectedStartDate: Date?
public var selectedEndDate: Date?
@objc public var selectedStartDate: Date?
@objc public var selectedEndDate: Date?
@objc var selectedStartCell: IndexPath?
@objc var selectedEndCell: IndexPath?

public var selectedColor = UIColor(red: 66/255.0, green: 150/255.0, blue: 240/255.0, alpha: 1.0)
public var titleText = "Select Dates"
@objc public var disabledDates: [Date]?

@objc public var cellHighlightedColor = UIColor(white: 0.9, alpha: 1.0)
@objc public static let defaultCellFontSize:CGFloat = 15.0
@objc public static let defaultHeaderFontSize:CGFloat = 17.0
@objc public var cellFont:UIFont = UIFont(name: "HelveticaNeue", size: CalendarDateRangePickerViewController.defaultCellFontSize)!
@objc public var headerFont:UIFont = UIFont(name: "HelveticaNeue-Light", size: CalendarDateRangePickerViewController.defaultHeaderFontSize)!


@objc public var selectedColor = UIColor(red: 66/255.0, green: 150/255.0, blue: 240/255.0, alpha: 1.0)
@objc public var selectedLabelColor = UIColor(red: 255/255.0, green: 255/255.0, blue: 255/255.0, alpha: 1.0)
@objc public var highlightedLabelColor = UIColor(red: 255/255.0, green: 255/255.0, blue: 255/255.0, alpha: 1.0)
@objc public var titleText = "Select Dates"

override public func viewDidLoad() {
super.viewDidLoad()
Expand All @@ -58,11 +73,11 @@ public class CalendarDateRangePickerViewController: UICollectionViewController {
self.navigationItem.rightBarButtonItem?.isEnabled = selectedStartDate != nil && selectedEndDate != nil
}

func didTapCancel() {
@objc func didTapCancel() {
delegate.didCancelPickingDateRange()
}

func didTapDone() {
@objc func didTapDone() {
if selectedStartDate == nil || selectedEndDate == nil {
return
}
Expand Down Expand Up @@ -90,7 +105,12 @@ extension CalendarDateRangePickerViewController {

override public func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
let cell = collectionView.dequeueReusableCell(withReuseIdentifier: cellReuseIdentifier, for: indexPath) as! CalendarDateRangePickerCell

cell.highlightedColor = self.cellHighlightedColor
cell.selectedColor = self.selectedColor
cell.selectedLabelColor = self.selectedLabelColor
cell.highlightedLabelColor = self.highlightedLabelColor
cell.font = self.cellFont
cell.reset()
let blankItems = getWeekday(date: getFirstDateForSection(section: indexPath.section)) - 1
if indexPath.item < 7 {
Expand All @@ -102,7 +122,17 @@ extension CalendarDateRangePickerViewController {
let date = getDate(dayOfMonth: dayOfMonth, section: indexPath.section)
cell.date = date
cell.label.text = "\(dayOfMonth)"


let dateFormatter = DateFormatter()
dateFormatter.dateFormat = "yyyy-MM-dd"
let datePreFormatted = dateFormatter.string(from: date)
let dateFormatted = dateFormatter.date(from: datePreFormatted)

if disabledDates != nil{
if (disabledDates?.contains(cell.date!))!{
cell.disable()
}
}
if isBefore(dateA: date, dateB: minimumDate) {
cell.disable()
}
Expand Down Expand Up @@ -135,6 +165,7 @@ extension CalendarDateRangePickerViewController {
case UICollectionElementKindSectionHeader:
let headerView = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withReuseIdentifier: headerReuseIdentifier, for: indexPath) as! CalendarDateRangePickerHeaderView
headerView.label.text = getMonthLabel(date: getFirstDateForSection(section: indexPath.section))
headerView.font = headerFont
return headerView
default:
fatalError("Unexpected element kind")
Expand All @@ -150,21 +181,35 @@ extension CalendarDateRangePickerViewController : UICollectionViewDelegateFlowLa
if cell.date == nil {
return
}
if isBefore(dateA: cell.date!, dateB: minimumDate) {
if isBefore(dateA: cell.date!, dateB: minimumDate){
return
}

if disabledDates != nil{
if (disabledDates?.contains(cell.date!))!{
return
}
}

if selectedStartDate == nil {
selectedStartDate = cell.date
selectedStartCell = indexPath
delegate.didSelectStartDate(startDate: selectedStartDate)
} else if selectedEndDate == nil {
if isBefore(dateA: selectedStartDate!, dateB: cell.date!) {
if isBefore(dateA: selectedStartDate!, dateB: cell.date!) && !isBetween(selectedStartCell!, and: indexPath){
selectedEndDate = cell.date
delegate.didSelectEndDate(endDate: selectedEndDate)
self.navigationItem.rightBarButtonItem?.isEnabled = true
} else {
// If a cell before the currently selected start date is selected then just set it as the new start date
selectedStartDate = cell.date
selectedStartCell = indexPath
delegate.didSelectStartDate(startDate: selectedStartDate)
}
} else {
selectedStartDate = cell.date
selectedStartCell = indexPath
delegate.didSelectStartDate(startDate: selectedStartDate)
selectedEndDate = nil
}
collectionView.reloadData()
Expand Down Expand Up @@ -197,23 +242,23 @@ extension CalendarDateRangePickerViewController {

// Helper functions

func getFirstDate() -> Date {
@objc func getFirstDate() -> Date {
var components = Calendar.current.dateComponents([.month, .year], from: minimumDate)
components.day = 1
return Calendar.current.date(from: components)!
}

func getFirstDateForSection(section: Int) -> Date {
@objc func getFirstDateForSection(section: Int) -> Date {
return Calendar.current.date(byAdding: .month, value: section, to: getFirstDate())!
}

func getMonthLabel(date: Date) -> String {
@objc func getMonthLabel(date: Date) -> String {
let dateFormatter = DateFormatter()
dateFormatter.dateFormat = "MMMM yyyy"
return dateFormatter.string(from: date)
}

func getWeekdayLabel(weekday: Int) -> String {
@objc func getWeekdayLabel(weekday: Int) -> String {
var components = DateComponents()
components.calendar = Calendar.current
components.weekday = weekday
Expand All @@ -226,26 +271,57 @@ extension CalendarDateRangePickerViewController {
return dateFormatter.string(from: date!)
}

func getWeekday(date: Date) -> Int {
@objc func getWeekday(date: Date) -> Int {
return Calendar.current.dateComponents([.weekday], from: date).weekday!
}

func getNumberOfDaysInMonth(date: Date) -> Int {
@objc func getNumberOfDaysInMonth(date: Date) -> Int {
return Calendar.current.range(of: .day, in: .month, for: date)!.count
}

func getDate(dayOfMonth: Int, section: Int) -> Date {
@objc func getDate(dayOfMonth: Int, section: Int) -> Date {
var components = Calendar.current.dateComponents([.month, .year], from: getFirstDateForSection(section: section))
components.day = dayOfMonth
return Calendar.current.date(from: components)!
}

func areSameDay(dateA: Date, dateB: Date) -> Bool {
@objc func areSameDay(dateA: Date, dateB: Date) -> Bool {
return Calendar.current.compare(dateA, to: dateB, toGranularity: .day) == ComparisonResult.orderedSame
}

func isBefore(dateA: Date, dateB: Date) -> Bool {
@objc func isBefore(dateA: Date, dateB: Date) -> Bool {
return Calendar.current.compare(dateA, to: dateB, toGranularity: .day) == ComparisonResult.orderedAscending
}

@objc func isBetween(_ startDateCellIndex: IndexPath, and endDateCellIndex: IndexPath) -> Bool {

if disabledDates == nil{
return false
}

var index = startDateCellIndex.row
var section = startDateCellIndex.section
var currentIndexPath: IndexPath
var cell: CalendarDateRangePickerCell?

while !(index == endDateCellIndex.row && section == endDateCellIndex.section){
currentIndexPath = IndexPath(row: index, section: section)
cell = collectionView?.cellForItem(at: currentIndexPath) as! CalendarDateRangePickerCell
if cell == nil{
section = section + 1
let blankItems = getWeekday(date: getFirstDateForSection(section: section)) - 1
index = blankItems + 1
currentIndexPath = IndexPath(row: index, section: section)
cell = collectionView?.cellForItem(at: currentIndexPath) as! CalendarDateRangePickerCell
}

if (disabledDates?.contains((cell?.date)!))!{
return true
}
index = index + 1
}

return false
}

}
Loading