From 639553612ab18e83a1824f5fd5caa77d067fde8f Mon Sep 17 00:00:00 2001 From: Charles Powell Date: Sun, 28 Apr 2013 17:46:48 -0700 Subject: [PATCH 1/3] Added optional change callback block --- XCDFormInputAccessoryView/XCDFormInputAccessoryView.h | 4 ++++ XCDFormInputAccessoryView/XCDFormInputAccessoryView.m | 3 +++ 2 files changed, 7 insertions(+) diff --git a/XCDFormInputAccessoryView/XCDFormInputAccessoryView.h b/XCDFormInputAccessoryView/XCDFormInputAccessoryView.h index 0ba942e..237f22a 100644 --- a/XCDFormInputAccessoryView/XCDFormInputAccessoryView.h +++ b/XCDFormInputAccessoryView/XCDFormInputAccessoryView.h @@ -7,6 +7,8 @@ #import +typedef void(^XCDFormInputAccessoryViewChangeBlock)(UIResponder *newResponder); + @interface XCDFormInputAccessoryView : UIView - (id) initWithResponders:(NSArray *)responders; // Objects must be UIResponder instances @@ -15,6 +17,8 @@ @property (nonatomic, assign) BOOL hasDoneButton; // Defaults to YES on iPhone, NO on iPad +@property (nonatomic, copy) XCDFormInputAccessoryViewChangeBlock changeBlock; + - (void) setHasDoneButton:(BOOL)hasDoneButton animated:(BOOL)animated; @end diff --git a/XCDFormInputAccessoryView/XCDFormInputAccessoryView.m b/XCDFormInputAccessoryView/XCDFormInputAccessoryView.m index 06a1fc2..ef03a34 100644 --- a/XCDFormInputAccessoryView/XCDFormInputAccessoryView.m +++ b/XCDFormInputAccessoryView/XCDFormInputAccessoryView.m @@ -155,6 +155,9 @@ - (void) selectAdjacentResponder:(UISegmentedControl *)sender if (adjacentResponderIndex >= 0 && adjacentResponderIndex < (NSInteger)[self.responders count]) adjacentResponder = [self.responders objectAtIndex:adjacentResponderIndex]; + if (self.changeBlock) + self.changeBlock(adjacentResponder); + [adjacentResponder becomeFirstResponder]; } From 011678c65df4ac73b34244b90b071e3d734688d0 Mon Sep 17 00:00:00 2001 From: Charles Powell Date: Sun, 28 Apr 2013 17:53:07 -0700 Subject: [PATCH 2/3] Update README for changeBlock property. --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 07fd3c2..12ef3b0 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,8 @@ If you want to have total control over what the **Previous** and **Next** button 1. Find all text fields and editable text views in the key window 2. Sort them using their frame origin vertical position +If you need notification of **Previous** and **Next** button presses, use the optional `changeBlock` property to add a block-based callback (but beware of `self` retain cycles!). + License ======= The MIT License (MIT) @@ -38,4 +40,4 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. From 8e4f2741823aac0581bb5d767e7f595b3a3e10b1 Mon Sep 17 00:00:00 2001 From: Charles Powell Date: Sun, 28 Apr 2013 17:55:52 -0700 Subject: [PATCH 3/3] Tweaked changeBlock typedef --- XCDFormInputAccessoryView/XCDFormInputAccessoryView.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/XCDFormInputAccessoryView/XCDFormInputAccessoryView.h b/XCDFormInputAccessoryView/XCDFormInputAccessoryView.h index 237f22a..82ff21a 100644 --- a/XCDFormInputAccessoryView/XCDFormInputAccessoryView.h +++ b/XCDFormInputAccessoryView/XCDFormInputAccessoryView.h @@ -7,7 +7,7 @@ #import -typedef void(^XCDFormInputAccessoryViewChangeBlock)(UIResponder *newResponder); +typedef void(^XCDFormInputAccessoryViewChangeBlock)(UIResponder *newFirstResponder); @interface XCDFormInputAccessoryView : UIView