Merge pull request #15 from kmcgill88/14-set-init-rows

14 set init rows
kmcgill88 · Jul 22, 2017 · ec8c218 · ec8c218
2 parents 6219c96 + f8feb1b
commit ec8c218
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 8 deletions.
diff --git a/Example/McPicker/ViewController.swift b/Example/McPicker/ViewController.swift
@@ -82,6 +82,10 @@ class ViewController: UIViewController {
         mcPicker.toolbarButtonsColor = .white
         mcPicker.toolbarBarTintColor = .darkGray
         mcPicker.pickerBackgroundColor = .gray
+        mcPicker.pickerSelectRowsForComponents = [
+            0: [3: true],
+            1: [2: true]
+        ]
 
         if let barButton = sender as? UIBarButtonItem {
             // Show as Popover

diff --git a/Example/Tests/McPickerTests.swift b/Example/Tests/McPickerTests.swift
@@ -166,7 +166,7 @@ class McPickerTests: XCTestCase {
         XCTAssertEqual(UIColor.purple, mcPicker.picker.backgroundColor)
     }
 
-    func testDimissViews_callsAnimateViews() {
+    func testDimissViews_callsAnimateViewsWhenShow() {
         // Given
         //
         class TestMcPicker: McPicker {
@@ -196,7 +196,7 @@ class McPickerTests: XCTestCase {
         XCTAssertEqual(McPicker.AnimationDirection.out, mcPicker.direction)
     }
 
-    func testDimissViews_calls() {
+    func testDimissViews_doesNotCallAnimateViewsWhenShowAsPopover() {
         // Given
         //
         class TestVC: UIViewController {
@@ -227,4 +227,28 @@ class McPickerTests: XCTestCase {
         XCTAssertNil(mcPicker.mcPickerPopoverViewController)
         XCTAssertFalse(mcPicker.calledAnimateViews)
     }
+
+    func testPickerSelectRowsForComponents() {
+        // Given
+        //
+        let data: [[String]] = [
+            ["Sir", "Mr", "Mrs", "Miss"],
+            ["Kevin", "Lauren", "Kibby", "Stella"]
+        ]
+        let mcPicker = McPicker(data: data)
+
+        // When
+        //
+        mcPicker.pickerSelectRowsForComponents = [
+            0: [3: true],
+            1: [2: true]
+        ]
+
+        // Then
+        //
+        XCTAssertEqual(3, mcPicker.picker.selectedRow(inComponent: 0))
+        XCTAssertEqual(2, mcPicker.picker.selectedRow(inComponent: 1))
+        XCTAssertEqual("Miss", mcPicker.pickerSelection[0]!)
+        XCTAssertEqual("Kibby", mcPicker.pickerSelection[1]!)
+    }
 }
diff --git a/McPicker.podspec b/McPicker.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'McPicker'
-  s.version          = '0.3.1'
+  s.version          = '0.4.0'
   s.summary          = 'McPicker is a UIPickerView drop-in solution with animations that is rotation ready.'
 
   s.description      = <<-DESC

diff --git a/McPicker/Classes/McPicker.swift b/McPicker/Classes/McPicker.swift
@@ -60,6 +60,21 @@ open class McPicker: UIView {
             picker.backgroundColor = pickerBackgroundColor
         }
     }
+    /**
+    Sets the picker's components row position and picker selections to those String values.
+
+    [Int:[Int:Bool]] equates to [Component: [Row: isAnimated]
+    */
+    public var pickerSelectRowsForComponents: [Int: [Int: Bool]]? {
+        didSet {
+            for component in pickerSelectRowsForComponents!.keys {
+                if let row = pickerSelectRowsForComponents![component]?.keys.first, let isAnimated = pickerSelectRowsForComponents![component]?.values.first {
+                    pickerSelection[component] = pickerData[component][row]
+                    picker.selectRow(row, inComponent: component, animated: isAnimated)
+                }
+            }
+        }
+    }
 
     internal var popOverContentSize: CGSize {
         return CGSize(width: Constant.pickerHeight + Constant.toolBarHeight, height: Constant.pickerHeight + Constant.toolBarHeight)

diff --git a/README.md b/README.md
@@ -35,22 +35,26 @@ McPicker.showAsPopover(data: data, fromViewController: self, barButtonItem: send
 
 #### Customization
 ```swift
+let data: [[String]] = [
+  ["Sir", "Mr", "Mrs", "Miss"],
+  ["Kevin", "Lauren", "Kibby", "Stella"]
+]
+
 let customLabel = UILabel()
 customLabel.textAlignment = .center
 customLabel.textColor = .white
 customLabel.font = UIFont(name:"American Typewriter", size: 30)!
 
-let data: [[String]] = [
-    ["Sir", "Mr", "Mrs", "Miss"],
-    ["Kevin", "Lauren", "Kibby", "Stella"]
-]
-
 let mcPicker = McPicker(data: data)
 mcPicker.label = customLabel // Set your custom label
 mcPicker.toolbarItemsFont = UIFont(name:"American Typewriter", size: 17)!
 mcPicker.toolbarButtonsColor = .white
 mcPicker.toolbarBarTintColor = .darkGray
 mcPicker.pickerBackgroundColor = .gray
+mcPicker.pickerSelectRowsForComponents = [
+    0: [3: true],
+    1: [2: true] // [Component: [Row: isAnimated]
+]
 
 if let barButton = sender as? UIBarButtonItem {
     // Show as Popover
@@ -71,6 +75,9 @@ if let barButton = sender as? UIBarButtonItem {
 }
 ```
 
+##### The `selections`
+McPicker's `doneHandler` passes back `selections: [Int : String]` as an argument. This is as simple as `[<Component Index>: <String of Selection>]` from the `data` you've passed in.
+
 ## Requirements
 - iOS 8+
 - Swift 3+