fix functions names for Objective-C

priore · Feb 5, 2018 · 5bae5da · 5bae5da
1 parent baa17f9
commit 5bae5da
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/DPPickerManager/Class/DPPickerManager.swift b/DPPickerManager/Class/DPPickerManager.swift
@@ -37,7 +37,7 @@ class DPPickerManager: NSObject, UIPickerViewDelegate, UIPickerViewDataSource {
     }
 
     @objc open func showPicker(title: String?, selected: Date?, min: Date?, max: Date?, completion:DPPickerDateCompletion?) {
-        self.showPicker(title: title, datePicker: { (picker) in
+        self.showPicker(title: title, picker: { (picker) in
             picker.date = selected ?? Date()
             picker.minimumDate = min
             picker.maximumDate = max
@@ -46,14 +46,14 @@ class DPPickerManager: NSObject, UIPickerViewDelegate, UIPickerViewDataSource {
         }, completion: completion)
     }
 
-    @objc open func showPicker(title: String?, datePicker:((_ picker: UIDatePicker) -> Void)?, completion:DPPickerDateCompletion?) {
-        let picker = UIDatePicker()
-        picker.timeZone = self.timeZone
+    @objc open func showPicker(title: String?, picker:((_ picker: UIDatePicker) -> Void)?, completion:DPPickerDateCompletion?) {
+        let datePicker = UIDatePicker()
+        datePicker.timeZone = self.timeZone
 
-        datePicker?(picker)
+        picker?(datePicker)
 
-        self.showPicker(title: title, picker: picker) { (cancel) in
-            completion?(picker.date, cancel)
+        self.showPicker(title: title, view: datePicker) { (cancel) in
+            completion?(datePicker.date, cancel)
         }
     }
 
@@ -73,7 +73,7 @@ class DPPickerManager: NSObject, UIPickerViewDelegate, UIPickerViewDataSource {
             }
         }
 
-        self.showPicker(title: title, picker: picker) { (cancel) in
+        self.showPicker(title: title, view: picker) { (cancel) in
 
             var index = -1
             var value: String? = nil
@@ -89,7 +89,7 @@ class DPPickerManager: NSObject, UIPickerViewDelegate, UIPickerViewDataSource {
         }
     }
 
-    @objc open func showPicker(title: String?, picker: UIView, completion:DPPickerCompletion?) {
+    @objc open func showPicker(title: String?, view: UIView, completion:DPPickerCompletion?) {
 
         var center: CGFloat?
         var buttonX: CGFloat = 0
@@ -98,9 +98,9 @@ class DPPickerManager: NSObject, UIPickerViewDelegate, UIPickerViewDataSource {
 
         // trick
         let alertView = UIAlertController(title: title, message: "\n\n\n\n\n\n\n\n\n\n", preferredStyle: .actionSheet);
-        alertView.view.addSubview(picker)
+        alertView.view.addSubview(view)
         alertView.popoverPresentationController?.sourceView = UIViewController.top?.view
-        alertView.popoverPresentationController?.sourceRect = picker.bounds
+        alertView.popoverPresentationController?.sourceRect = view.bounds
         alertView.view.tintColor = .gray
         self.alertView = alertView
 
@@ -115,8 +115,8 @@ class DPPickerManager: NSObject, UIPickerViewDelegate, UIPickerViewDataSource {
         default: break
         }
 
-        picker.center.x = center ?? 0
-        picker.transform = .init(translationX: -10, y: title != nil ? 35 : 0)
+        view.center.x = center ?? 0
+        view.transform = .init(translationX: -10, y: title != nil ? 35 : 0)
 
         self.pickerCompletion = completion
 

diff --git a/DPPickerManager/ViewController.swift b/DPPickerManager/ViewController.swift
@@ -34,7 +34,7 @@ class ViewController: UIViewController {
     }
 
     @IBAction func didTimePicker() {
-        DPPickerManager.shared.showPicker(title: "Time Picker", datePicker: { (picker) in
+        DPPickerManager.shared.showPicker(title: "Time Picker", picker: { (picker) in
             picker.date = Date()
             picker.datePickerMode = .time
         }) { (date, cancel) in

diff --git a/README.md b/README.md
@@ -44,7 +44,7 @@ DPPickerManager.shared.showPicker(title: "Date Picker", selected: Date(), min: m
 
 ```swift
 // Time Picker (custom picker)
-DPPickerManager.shared.showPicker(title: "Time Picker", datePicker: { (picker) in
+DPPickerManager.shared.showPicker(title: "Time Picker", picker: { (picker) in
     picker.date = Date()
     picker.datePickerMode = .time
 }) { (date, cancel) in