Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 14 additions & 3 deletions Calendar/CalendarKit/CalendarView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,22 @@ class CalendarView: UIView, UICollectionViewDataSource, UICollectionViewDelegate
var baseDate: Date? {
didSet {
collectionData = [CalendarLogic]()
if let date = baseDate {
var dateIter1 = date, dateIter2 = date

let df = DateFormatter()
df.dateFormat = "yyyy-MM-dd"

let str = df.string(from: baseDate!)

let dateNew = df.date(from: str)

if let date = dateNew {

var dateIter1 = date

var dateIter2 = date

var set = Set<CalendarLogic>()
set.insert(CalendarLogic(date: baseDate!))
set.insert(CalendarLogic(date: dateNew!))

// advance one year
(0..<kMonthRange).forEach { _ in
Expand Down
7 changes: 6 additions & 1 deletion Calendar/ViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,12 @@ class ViewController: UIViewController, CalendarViewDelegate {
super.viewDidLoad()

// todays date.
let date = Date()
let df = DateFormatter()
df.dateFormat = "yyyy-MM-dd"

let str = df.string(from: Date())

let date = df.date(from: str)!

// create an instance of calendar view with
// base date (Calendar shows 12 months range from current base date)
Expand Down