Skip to content

Commit

Permalink
cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
AmirShayegh committed Sep 7, 2018
1 parent cbc6e9d commit d20167b
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 60 deletions.
32 changes: 16 additions & 16 deletions DatePicker/Classes/PickerViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -218,22 +218,22 @@ public class PickerViewController: UIViewController {
No longer being used.
*/
return
if loading {return}
// if date is valid, send back
if self.mode == .Yearless {
if self.month >= 1 && self.month <= 12, let yearlessLive = yearlessLiveCallBack {
yearlessLive(self.month, self.day)
}
// guard let yearlessLive = yearlessLiveCallBack else {return}
// yearlessLive(self.month, self.day)
} else {
guard let date = FDHelper.shared.dateFrom(day: self.day, month: self.month, year: self.year) , let completion = self.liveCallBack else {return}
if let min = self.minDate, let max = self.maxDate {
if date <= max && date >= min {
completion(date)
}
}
}
// if loading {return}
// // if date is valid, send back
// if self.mode == .Yearless {
// if self.month >= 1 && self.month <= 12, let yearlessLive = yearlessLiveCallBack {
// yearlessLive(self.month, self.day)
// }
// // guard let yearlessLive = yearlessLiveCallBack else {return}
// // yearlessLive(self.month, self.day)
// } else {
// guard let date = FDHelper.shared.dateFrom(day: self.day, month: self.month, year: self.year) , let completion = self.liveCallBack else {return}
// if let min = self.minDate, let max = self.maxDate {
// if date <= max && date >= min {
// completion(date)
// }
// }
// }
}

// MARK: Utility Functions
Expand Down
47 changes: 3 additions & 44 deletions Example/DatePicker/ViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -25,25 +25,6 @@ class ViewController: UIViewController {

@IBAction func popover(_ sender: UIButton) {
self.label.alpha = 1
// let fd = DatePicker()
// let start = FDHelper.shared.dateFrom(day: 18, month: 07, year: 2018)
// let end = FDHelper.shared.dateFrom(day: 10, month: 12, year: 2018)
// fd.setup(min: start!, max: end!, dateChanged: { (date) in
// print("\(date)")
// self.label.text = "\(date)"
// }) { (selected, date) in
// if selected, let d = date {
// self.label.text = "Selected \(d)"
// } else {
// self.label.text = "cancelled"
// }
// }
//
// fd.displayPopOver(on: sender, in: self, completion: {
//
// })


let picker = DatePicker()
picker.setupYearless(minMonth: 3, minDay: 8 ) { (selected, month, day) in
if selected, let day = day, let month = month {
Expand All @@ -53,25 +34,17 @@ class ViewController: UIViewController {
}
}

picker.displayPopOver(on: sender, in: self) {

}
picker.displayPopOver(on: sender, in: self) {}

}

@IBAction func present(_ sender: UIButton) {
self.label.alpha = 1
let fd = DatePicker()

// you can generate dates using this function
let date1 = FDHelper.shared.dateFrom(day: 18, month: 08, year: 1990)
let date2 = FDHelper.shared.dateFrom(day: 18, month: 08, year: 2020)
// fd.setup(min: date1!, max: date2!, dateChanged: { (date) in
//
// }) { (selected, date) in
// if selected {
//
// }
// }


fd.setup { (selected, date) in
if selected, let d = date {
Expand All @@ -83,20 +56,6 @@ class ViewController: UIViewController {

fd.display(in: self)

// self.label.alpha = 1
// let picker = DatePicker()
// picker.setupYearless(minMonth: 2, minDay: 5, dateChanged: { month, day in
// self.label.text = "changed \(FDHelper.shared.month(number: month)) \(day)"
// }) { (selected, month, day) in
// if selected, let day = day, let month = month {
// self.label.text = "selected \(FDHelper.shared.month(number: month)) \(day)"
// } else {
// self.label.text = "Cancelled"
// }
// }
//
// picker.display(in: self)

}


Expand Down

0 comments on commit d20167b

Please sign in to comment.