Added docs, and a few minor updates.

Author: ruddfawcett

RFKeyboardToolbar/RFKeyboardToolbar.h

@@ -6,13 +6,41 @@
 //
 
 #import <UIKit/UIKit.h>
+#include <AvailabilityMacros.h>
+
+#import "RFToolbarButton.h"
 
 @interface RFKeyboardToolbar : UIView
 
+/**
+ *  The buttons of the toolbar.
+ */
 @property (nonatomic, strong) NSArray *buttons;
 
-+ (instancetype)toolbarViewWithButtons:(NSArray *)buttons;
+/**
+ *  Creates a new toolbar.
+ *
+ *  @param buttons The buttons to draw in the view.
+ *
+ *  @return A RFKeyboardToolbar.
+ */
++ (instancetype)toolbarWithButtons:(NSArray *)buttons;
+
+/**
+ *  Creates a new toolbar.
+ *
+ *  @param buttons The buttons to draw in the view.
+ *
+ *  @return A RFKeyboardToolbar.
+ */
++ (instancetype)toolbarViewWithButtons:(NSArray *)buttons DEPRECATED_MSG_ATTRIBUTE("This will still work, but there's a shorter method available, toolbarWithButtons:");
 
+/**
+ *  
+ *
+ *  @param buttons  Sets the buttons for the toolbar.
+ *  @param animated Whether or not it should be animated.
+ */
 - (void)setButtons:(NSArray *)buttons animated:(BOOL)animated;
 
 @end

RFKeyboardToolbar/RFKeyboardToolbar.m

@@ -6,26 +6,39 @@
 //
 
 #import "RFKeyboardToolbar.h"
-#import "RFToolbarButton.h"
 
 @interface RFKeyboardToolbar ()
 
+/**
+ *  The toolbar view.
+ */
 @property (nonatomic,strong) UIView *toolbarView;
+/**
+ *  The scroll view that's faked to look like a toolbar.
+ */
 @property (nonatomic,strong) UIScrollView *scrollView;
+/**
+ *  The fake top border to replicate the toolbar.
+ */
 @property (nonatomic,strong) CALayer *topBorder;
 
 @end
 
 @implementation RFKeyboardToolbar
 
++ (instancetype)toolbarWithButtons:(NSArray *)buttons {
+    return [[RFKeyboardToolbar alloc] initWithButtons:buttons];
+}
+
 + (instancetype)toolbarViewWithButtons:(NSArray *)buttons {
     return [[RFKeyboardToolbar alloc] initWithButtons:buttons];
 }
 
-- (id)initWithButtons:(NSArray*)buttons {
+- (id)initWithButtons:(NSArray *)buttons {
     self = [super initWithFrame:CGRectMake(0, 0, self.window.rootViewController.view.bounds.size.width, 40)];
     if (self) {
         _buttons = [buttons copy];
+        
         self.autoresizingMask = UIViewAutoresizingFlexibleWidth|UIViewAutoresizingFlexibleHeight;
         [self addSubview:[self inputAccessoryView]];
     }
@@ -39,7 +52,7 @@ - (void)layoutSubviews {
     _topBorder.frame = frame;
 }
 
-- (UIView*)inputAccessoryView {
+- (UIView *)inputAccessoryView {
     _toolbarView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, self.bounds.size.width, 40)];
     _toolbarView.backgroundColor = [UIColor colorWithWhite:0.973 alpha:1.0];
     _toolbarView.autoresizingMask = UIViewAutoresizingFlexibleWidth|UIViewAutoresizingFlexibleHeight;
@@ -54,7 +67,7 @@ - (UIView*)inputAccessoryView {
     return _toolbarView;
 }
 
-- (UIScrollView*)fakeToolbar {
+- (UIScrollView *)fakeToolbar {
     _scrollView = [[UIScrollView alloc] initWithFrame:CGRectMake(0, 0, self.bounds.size.width, 40)];
     _scrollView.backgroundColor = [UIColor clearColor];
     _scrollView.autoresizingMask = UIViewAutoresizingFlexibleWidth|UIViewAutoresizingFlexibleHeight;
@@ -66,8 +79,7 @@ - (UIScrollView*)fakeToolbar {
     return _scrollView;
 }
 
-- (void)addButtons
-{
+- (void)addButtons {
     NSUInteger index = 0;
     NSUInteger originX = 8;
 
@@ -88,17 +100,14 @@ - (void)addButtons
     _scrollView.contentSize = contentSize;
 }
 
-- (void)setButtons:(NSArray*)buttons
-{
+- (void)setButtons:(NSArray *)buttons {
     [_buttons makeObjectsPerformSelector:@selector(removeFromSuperview)];
     _buttons = [buttons copy];
     [self addButtons];
 }
 
-- (void)setButtons:(NSArray *)buttons animated:(BOOL)animated
-{
-    if (animated == NO)
-    {
+- (void)setButtons:(NSArray *)buttons animated:(BOOL)animated {
+    if (!animated) {
         self.buttons = buttons;
         return;
     }
@@ -113,6 +122,7 @@ - (void)setButtons:(NSArray *)buttons animated:(BOOL)animated
     NSUInteger originX = 8;
     NSUInteger index = 0;
     NSMutableArray *buttonFrames = [NSMutableArray arrayWithCapacity:_buttons.count];
+    
     for (RFToolbarButton *button in _buttons) {
         CGRect frame = CGRectMake(originX, 0, button.frame.size.width, button.frame.size.height);
         [buttonFrames addObject:[NSValue valueWithCGRect:frame]];
@@ -123,8 +133,9 @@ - (void)setButtons:(NSArray *)buttons animated:(BOOL)animated
 
     CGSize contentSize = _scrollView.contentSize;
     contentSize.width = originX - 8;
-    if (contentSize.width > _scrollView.contentSize.width)
+    if (contentSize.width > _scrollView.contentSize.width) {
         _scrollView.contentSize = contentSize;
+    }
 
     // make added buttons appear from the right
     [addButtons enumerateObjectsUsingBlock:^(RFToolbarButton *button, BOOL *stop) {

RFKeyboardToolbar/RFToolbarButton.h

@@ -7,12 +7,39 @@
 
 #import <UIKit/UIKit.h>
 
+/**
+ *  The block used for each button.
+ */
 typedef void (^eventHandlerBlock)();
 
 @interface RFToolbarButton : UIButton
 
+/**
+ *  Creates a new RFToolbarButton.
+ *
+ *  @param title The string to show on the button.
+ *
+ *  @return A new button.
+ */
 + (instancetype)buttonWithTitle:(NSString *)title;
 
+/**
+ *  Creates a new RFToolbarButton.
+ *
+ *  @param title        The string to show on the button.
+ *  @param eventHandler The event handler block.
+ *  @param controlEvent The type of event.
+ *
+ *  @return A new button.
+ */
++ (instancetype)buttonWithTitle:(NSString *)title andEventHandler:(eventHandlerBlock)eventHandler forControlEvents:(UIControlEvents)controlEvent;
+
+/**
+ *  Adds the event handler for the button.
+ *
+ *  @param eventHandler The event handler block.
+ *  @param controlEvent The type of event.
+ */
 - (void)addEventHandler:(eventHandlerBlock)eventHandler forControlEvents:(UIControlEvents)controlEvent;
 
 @end

RFKeyboardToolbar/RFToolbarButton.m

@@ -9,7 +9,14 @@
 
 @interface RFToolbarButton ()
 
+/**
+ *  The button's title.
+ */
 @property (nonatomic, strong) NSString *title;
+
+/**
+ *  The button's event block.
+ */
 @property (nonatomic, copy) eventHandlerBlock buttonPressBlock;
 
 @end
@@ -20,17 +27,22 @@ + (instancetype)buttonWithTitle:(NSString *)title {
     return [[self alloc] initWithTitle:title];
 }
 
++ (instancetype)buttonWithTitle:(NSString *)title andEventHandler:(eventHandlerBlock)eventHandler forControlEvents:(UIControlEvents)controlEvent {
+    RFToolbarButton *newButton = [RFToolbarButton buttonWithTitle:title];
+    [newButton addEventHandler:eventHandler forControlEvents:controlEvent];
+    
+    return newButton;
+}
+
 - (id)initWithTitle:(NSString *)title {
     _title = title;
     return [self init];
 }
 
-- (id)init
-{
+- (id)init {
     CGSize sizeOfText = [self.title sizeWithAttributes:@{NSFontAttributeName:[UIFont boldSystemFontOfSize:14.f]}];
 
-    self = [super initWithFrame:CGRectMake(0, 0, sizeOfText.width + 18.104, sizeOfText.height + 10.298)];
-    if (self) {
+    if (self = [super initWithFrame:CGRectMake(0, 0, sizeOfText.width + 18.104, sizeOfText.height + 10.298)]) {
         self.backgroundColor = [UIColor colorWithWhite:0.902 alpha:1.0];
 
         self.layer.cornerRadius = 3.0f;

RFKeyboardToolbarDemo/RFKeyboardToolbar/AppDelegate.m

@@ -10,8 +10,7 @@
 
 @implementation AppDelegate
 
-- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
-{
+- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
     self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
 
     ViewController *viewController = [[ViewController alloc] init];

RFKeyboardToolbarDemo/RFKeyboardToolbar/ViewController.h

@@ -8,6 +8,8 @@
 
 #import <UIKit/UIKit.h>
 
+@class RFKeyboardToolbar;
+
 @interface ViewController : UIViewController <UITextViewDelegate>
 
 @end

RFKeyboardToolbarDemo/RFKeyboardToolbar/ViewController.m

@@ -8,18 +8,17 @@
 
 #import "ViewController.h"
 #import "RFKeyboardToolbar.h"
-#import "RFToolbarButton.h"
 
 @interface ViewController ()
 
-@property (nonatomic,strong) UITextView *textView;
+@property (strong, nonatomic) UITextView *textView;
+@property (strong, nonatomic) RFKeyboardToolbar *keyboardToolbar;
 
 @end
 
 @implementation UITextView (InsertWord)
 
-- (void)insertWord:(NSString*)word
-{
+- (void)insertWord:(NSString*)word {
     // insert a word into the field, adding a space before and/or after it as necessary
     NSCharacterSet *whitespace = [NSCharacterSet whitespaceAndNewlineCharacterSet];
     NSRange selectedRange = self.selectedRange;
@@ -36,9 +35,6 @@ - (void)insertWord:(NSString*)word
 @end
 
 @implementation ViewController
-{
-    RFKeyboardToolbar *keyboardToolbar;
-}
 
 - (void)viewDidLoad
 {
@@ -48,21 +44,27 @@ - (void)viewDidLoad
 
     _textView = [[UITextView alloc] initWithFrame:self.view.bounds];
 
-    RFToolbarButton *exampleButton = [RFToolbarButton buttonWithTitle:@"Example"];
+    NSMutableArray *buttons = NSMutableArray.array;
 
-    [exampleButton addEventHandler:^{
-        [_textView insertText:@"You pressed a button!"];
-    } forControlEvents:UIControlEventTouchUpInside];
+    NSNumberFormatter *numberFormatter = [NSNumberFormatter new];
+    [numberFormatter setNumberStyle:NSNumberFormatterSpellOutStyle];
 
-    keyboardToolbar = [RFKeyboardToolbar toolbarViewWithButtons:@[exampleButton]];
-    _textView.inputAccessoryView = keyboardToolbar;
+    for (int i = 1; i <= 20; i++) {
+        RFToolbarButton *button = [RFToolbarButton buttonWithTitle:[numberFormatter stringFromNumber:@(i)] andEventHandler:^{
+            [_textView insertText:@"You pressed a button!"];
+        } forControlEvents:UIControlEventTouchUpInside];
+        
+        [buttons addObject:button];
+    }
+    
+    _keyboardToolbar = [RFKeyboardToolbar toolbarWithButtons:buttons];
+    _textView.inputAccessoryView = _keyboardToolbar;
     _textView.delegate = self;
 
     [self.view addSubview:_textView];
 }
 
-- (void)textViewDidChange:(UITextView *)textView
-{
+- (void)textViewDidChange:(UITextView *)textView {
     // count words
     NSArray *allWords = [textView.text.lowercaseString componentsSeparatedByCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
     NSCountedSet *words = [NSCountedSet new];
@@ -73,7 +75,7 @@ - (void)textViewDidChange:(UITextView *)textView
     }
 
     // dictionary of existing words => buttons
-    NSDictionary *oldButtons = [NSDictionary dictionaryWithObjects:keyboardToolbar.buttons forKeys:[keyboardToolbar.buttons valueForKey:@"title"]];
+    NSDictionary *oldButtons = [NSDictionary dictionaryWithObjects:_keyboardToolbar.buttons forKeys:[_keyboardToolbar.buttons valueForKey:@"title"]];
 
     // create new buttons
     NSMutableArray *newButtons = [NSMutableArray arrayWithCapacity:words.count];
@@ -96,7 +98,7 @@ - (void)textViewDidChange:(UITextView *)textView
         if (count1 == count2) return [[obj1 title] compare:[obj2 title]];
         return count1 > count2 ? NSOrderedAscending : NSOrderedDescending;
     }];
-    [keyboardToolbar setButtons:newButtons animated:YES];
+    [_keyboardToolbar setButtons:newButtons animated:YES];
 }
 
 @end