Skip to content

Single date selection added. #27

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
ajoykarmakar459 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Single date selection added. #27

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 22 additions & 13 deletions CalendarDateRangePickerViewController/Classes/CalendarDateRangePickerViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@
import UIKit

public protocol CalendarDateRangePickerViewControllerDelegate {
func didCancelPickingDateRange()
func didPickDateRange(startDate: Date!, endDate: Date!)
func didTapCancel()
func didTapDoneWithDateRange(startDate: Date!, endDate: Date!)

func didTapDoneWithSignleDateRange(startDate: Date!)
}

public class CalendarDateRangePickerViewController: UICollectionViewController {
Expand All @@ -29,21 +31,19 @@ public class CalendarDateRangePickerViewController: UICollectionViewController {

public var selectedStartDate: Date?
public var selectedEndDate: Date?

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

override public func viewDidLoad() {
super.viewDidLoad()

self.title = self.titleText
self.title = "Select Dates"

collectionView?.dataSource = self
collectionView?.delegate = self
collectionView?.backgroundColor = UIColor.white

collectionView?.register(CalendarDateRangePickerCell.self, forCellWithReuseIdentifier: cellReuseIdentifier)
collectionView?.register(CalendarDateRangePickerHeaderView.self, forSupplementaryViewOfKind: UICollectionElementKindSectionHeader, withReuseIdentifier: headerReuseIdentifier)

collectionView?.contentInset = collectionViewInsets

if minimumDate == nil {
Expand All @@ -54,20 +54,30 @@ public class CalendarDateRangePickerViewController: UICollectionViewController {
}

self.navigationItem.leftBarButtonItem = UIBarButtonItem(title: "Cancel", style: .plain, target: self, action: #selector(CalendarDateRangePickerViewController.didTapCancel))

self.navigationItem.rightBarButtonItem = UIBarButtonItem(title: "Done", style: .done, target: self, action: #selector(CalendarDateRangePickerViewController.didTapDone))
self.navigationItem.rightBarButtonItem?.isEnabled = selectedStartDate != nil && selectedEndDate != nil

// self.navigationItem.rightBarButtonItem = UIBarButtonItem(title: "Single", style: .done, target: self, action: #selector(CalendarDateRangePickerViewController.didTapDoneSignle))

// self.navigationItem.rightBarButtonItem?.isEnabled = selectedStartDate != nil && selectedEndDate != nil
}

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

func didTapDone() {
@objc func didTapDone() {
if selectedStartDate == nil || selectedEndDate == nil {
delegate.didTapDoneWithSignleDateRange(startDate: selectedStartDate!)
}

if selectedStartDate == nil || selectedEndDate == nil {

return
}
delegate.didPickDateRange(startDate: selectedStartDate!, endDate: selectedEndDate!)
delegate.didTapDoneWithDateRange(startDate: selectedStartDate!, endDate: selectedEndDate!)
}


}

Expand All @@ -90,7 +100,6 @@ extension CalendarDateRangePickerViewController {

override public func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
let cell = collectionView.dequeueReusableCell(withReuseIdentifier: cellReuseIdentifier, for: indexPath) as! CalendarDateRangePickerCell
cell.selectedColor = self.selectedColor
cell.reset()
let blankItems = getWeekday(date: getFirstDateForSection(section: indexPath.section)) - 1
if indexPath.item < 7 {
Expand Down Expand Up @@ -175,7 +184,7 @@ extension CalendarDateRangePickerViewController : UICollectionViewDelegateFlowLa
sizeForItemAt indexPath: IndexPath) -> CGSize {
let padding = collectionViewInsets.left + collectionViewInsets.right
let availableWidth = view.frame.width - padding
let itemWidth = availableWidth / CGFloat(itemsPerRow)
let itemWidth = round(availableWidth / CGFloat(itemsPerRow))
return CGSize(width: itemWidth, height: itemHeight)
}

Expand Down