added UIGestureRecognizer

lavoy · Oct 17, 2013 · 7dc6af1 · 7dc6af1
1 parent e4e909d
commit 7dc6af1
Show file tree

Hide file tree

Showing 10 changed files with 89 additions and 16 deletions.
diff --git a/ALActionBlocks/ALActionBlockWrapper.h b/ALActionBlocks/ALActionBlockWrapper.h
@@ -9,6 +9,8 @@
 #import <Foundation/Foundation.h>
 #import "ALActionBlock.h"
 
+static NSString *const ALActionBlocksArray = @"ALActionBlocksArray";
+
 @interface ALActionBlockWrapper : NSObject
 
 @property (nonatomic, copy) ALActionBlock actionBlock;

diff --git a/ALActionBlocks/ALActionBlockWrapper.m b/ALActionBlocks/ALActionBlockWrapper.m
@@ -11,6 +11,7 @@
 
 @implementation ALActionBlockWrapper
 
+
 - (void)invokeBlock:(id)sender {
     if (self.actionBlock) {
         self.actionBlock(sender);

diff --git a/ALActionBlocks/ALActionBlocks.h b/ALActionBlocks/ALActionBlocks.h
@@ -7,4 +7,5 @@
 //
 
 #import "UIControl+ALActionBlocks.h"
-#import "UIBarButtonItem+ALActionBlocks.h"
+#import "UIBarButtonItem+ALActionBlocks.h"
+#import "UIGestureRecognizer+ALActionBlocks.h"
diff --git a/ALActionBlocks/UIBarButtonItem+ALActionBlocks.h b/ALActionBlocks/UIBarButtonItem+ALActionBlocks.h
@@ -12,10 +12,10 @@
 
 @interface UIBarButtonItem (ALActionBlocks)
 
-- (id)initWithBarButtonSystemItem:(UIBarButtonSystemItem)systemItem block:(ALActionBlock)actionBlock;
-- (id)initWithImage:(UIImage *)image landscapeImagePhone:(UIImage *)landscapeImagePhone style:(UIBarButtonItemStyle)style block:(ALActionBlock)actionBlock;
-- (id)initWithImage:(UIImage *)image style:(UIBarButtonItemStyle)style block:(ALActionBlock)actionBlock;
-- (id)initWithTitle:(NSString *)title style:(UIBarButtonItemStyle)style block:(ALActionBlock)actionBlock;
+- (instancetype)initWithBarButtonSystemItem:(UIBarButtonSystemItem)systemItem block:(ALActionBlock)actionBlock;
+- (instancetype)initWithImage:(UIImage *)image landscapeImagePhone:(UIImage *)landscapeImagePhone style:(UIBarButtonItemStyle)style block:(ALActionBlock)actionBlock;
+- (instancetype)initWithImage:(UIImage *)image style:(UIBarButtonItemStyle)style block:(ALActionBlock)actionBlock;
+- (instancetype)initWithTitle:(NSString *)title style:(UIBarButtonItemStyle)style block:(ALActionBlock)actionBlock;
 
 - (void)setBlock:(ALActionBlock)actionBlock;
 

diff --git a/ALActionBlocks/UIBarButtonItem+ALActionBlocks.m b/ALActionBlocks/UIBarButtonItem+ALActionBlocks.m
@@ -10,34 +10,33 @@
 #import "ALActionBlockWrapper.h"
 #import <objc/runtime.h>
 
-static NSString *const ALActionBlocksArray = @"ALActionBlocksArray";
 
 @implementation UIBarButtonItem (ALActionBlocks)
 
 
-- (id)initWithBarButtonSystemItem:(UIBarButtonSystemItem)systemItem block:(ALActionBlock)actionBlock {
-    UIBarButtonItem *barButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:systemItem target:nil action:nil];
+- (instancetype)initWithBarButtonSystemItem:(UIBarButtonSystemItem)systemItem block:(ALActionBlock)actionBlock {
+    UIBarButtonItem *barButtonItem = [[[self class] alloc] initWithBarButtonSystemItem:systemItem target:nil action:nil];
     [barButtonItem setBlock:actionBlock];
     return barButtonItem;
 }
 
 
-- (id)initWithImage:(UIImage *)image landscapeImagePhone:(UIImage *)landscapeImagePhone style:(UIBarButtonItemStyle)style block:(ALActionBlock)actionBlock {
-    UIBarButtonItem *barButtonItem = [[UIBarButtonItem alloc] initWithImage:image landscapeImagePhone:landscapeImagePhone style:style target:nil action:nil];
+- (instancetype)initWithImage:(UIImage *)image landscapeImagePhone:(UIImage *)landscapeImagePhone style:(UIBarButtonItemStyle)style block:(ALActionBlock)actionBlock {
+    UIBarButtonItem *barButtonItem = [[[self class] alloc] initWithImage:image landscapeImagePhone:landscapeImagePhone style:style target:nil action:nil];
     [barButtonItem setBlock:actionBlock];
     return barButtonItem;
 }
 
 
-- (id)initWithImage:(UIImage *)image style:(UIBarButtonItemStyle)style block:(ALActionBlock)actionBlock {
-    UIBarButtonItem *barButtonItem = [[UIBarButtonItem alloc] initWithImage:image style:style target:nil action:nil];
+- (instancetype)initWithImage:(UIImage *)image style:(UIBarButtonItemStyle)style block:(ALActionBlock)actionBlock {
+    UIBarButtonItem *barButtonItem = [[[self class] alloc] initWithImage:image style:style target:nil action:nil];
     [barButtonItem setBlock:actionBlock];
     return barButtonItem;
 }
 
 
-- (id)initWithTitle:(NSString *)title style:(UIBarButtonItemStyle)style block:(ALActionBlock)actionBlock {
-    UIBarButtonItem *barButtonItem = [[UIBarButtonItem alloc] initWithTitle:title style:style target:nil action:nil];
+- (instancetype)initWithTitle:(NSString *)title style:(UIBarButtonItemStyle)style block:(ALActionBlock)actionBlock {
+    UIBarButtonItem *barButtonItem = [[[self class] alloc] initWithTitle:title style:style target:nil action:nil];
     [barButtonItem setBlock:actionBlock];
     return barButtonItem;
 }

diff --git a/ALActionBlocks/UIControl+ALActionBlocks.m b/ALActionBlocks/UIControl+ALActionBlocks.m
@@ -13,7 +13,6 @@
 
 @implementation UIControl (ALActionBlocks)
 
-static NSString *const ALActionBlocksArray = @"ALActionBlocksArray";
 
 - (void)handleControlEvents:(UIControlEvents)controlEvents withBlock:(ALActionBlock)actionBlock {
     NSMutableArray *actionBlocksArray = [self actionBlocksArray];

diff --git a/ALActionBlocks/UIGestureRecognizer+ALActionBlocks.h b/ALActionBlocks/UIGestureRecognizer+ALActionBlocks.h
@@ -0,0 +1,17 @@
+//
+//  UIGestureRecognizer+ALActionBlocks.h
+//  ALActionBlocks
+//
+//  Created by Andy LaVoy on 10/17/13.
+//  Copyright (c) 2013 Andy LaVoy. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import "ALActionBlock.h"
+
+@interface UIGestureRecognizer (ALActionBlocks)
+
+- (instancetype)initWithBlock:(ALActionBlock)actionBlock;
+- (void)setBlock:(ALActionBlock)actionBlock;
+
+@end
diff --git a/ALActionBlocks/UIGestureRecognizer+ALActionBlocks.m b/ALActionBlocks/UIGestureRecognizer+ALActionBlocks.m
@@ -0,0 +1,43 @@
+//
+//  UIGestureRecognizer+ALActionBlocks.m
+//  ALActionBlocks
+//
+//  Created by Andy LaVoy on 10/17/13.
+//  Copyright (c) 2013 Andy LaVoy. All rights reserved.
+//
+
+#import "UIGestureRecognizer+ALActionBlocks.h"
+#import "ALActionBlockWrapper.h"
+#import <objc/runtime.h>
+
+@implementation UIGestureRecognizer (ALActionBlocks)
+
+
+- (instancetype)initWithBlock:(ALActionBlock)actionBlock {
+    UIGestureRecognizer *gestureRecognizer = [[[self class] alloc] init];
+    [gestureRecognizer setBlock:actionBlock];
+    return gestureRecognizer;
+}
+
+
+- (void)setBlock:(ALActionBlock)actionBlock {
+    NSMutableArray *actionBlocksArray = [self actionBlocksArray];
+
+    ALActionBlockWrapper *blockActionWrapper = [[ALActionBlockWrapper alloc] init];
+    blockActionWrapper.actionBlock = actionBlock;
+    [actionBlocksArray addObject:blockActionWrapper];
+
+    [self addTarget:blockActionWrapper action:@selector(invokeBlock:)];
+}
+
+
+- (NSMutableArray *)actionBlocksArray {
+    NSMutableArray *actionBlocksArray = objc_getAssociatedObject(self, &ALActionBlocksArray);
+    if (!actionBlocksArray) {
+        actionBlocksArray = [NSMutableArray array];
+        objc_setAssociatedObject(self, &ALActionBlocksArray, actionBlocksArray, OBJC_ASSOCIATION_RETAIN);
+    }
+    return actionBlocksArray;
+}
+
+@end
diff --git a/Demo/ALActionBlocks.xcodeproj/project.pbxproj b/Demo/ALActionBlocks.xcodeproj/project.pbxproj
@@ -19,6 +19,7 @@
 		A1AE07D5170741AC0028A95E /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A1AE07D4170741AC0028A95E /* Default@2x.png */; };
 		A1AE07D7170741AC0028A95E /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A1AE07D6170741AC0028A95E /* Default-568h@2x.png */; };
 		A1AE07DA170741AC0028A95E /* ALViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A1AE07D9170741AC0028A95E /* ALViewController.m */; };
+		A1C48A15181060B500734781 /* UIGestureRecognizer+ALActionBlocks.m in Sources */ = {isa = PBXBuildFile; fileRef = A1C48A14181060B500734781 /* UIGestureRecognizer+ALActionBlocks.m */; };
 		A1F120D11733050400363A8F /* UIControl+ALActionBlocks.m in Sources */ = {isa = PBXBuildFile; fileRef = A1F120D01733050400363A8F /* UIControl+ALActionBlocks.m */; };
 /* End PBXBuildFile section */
 
@@ -43,6 +44,8 @@
 		A1AE07D6170741AC0028A95E /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
 		A1AE07D8170741AC0028A95E /* ALViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ALViewController.h; sourceTree = "<group>"; };
 		A1AE07D9170741AC0028A95E /* ALViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ALViewController.m; sourceTree = "<group>"; };
+		A1C48A13181060B500734781 /* UIGestureRecognizer+ALActionBlocks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIGestureRecognizer+ALActionBlocks.h"; sourceTree = "<group>"; };
+		A1C48A14181060B500734781 /* UIGestureRecognizer+ALActionBlocks.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIGestureRecognizer+ALActionBlocks.m"; sourceTree = "<group>"; };
 		A1F120CF1733050400363A8F /* UIControl+ALActionBlocks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIControl+ALActionBlocks.h"; sourceTree = "<group>"; };
 		A1F120D01733050400363A8F /* UIControl+ALActionBlocks.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIControl+ALActionBlocks.m"; sourceTree = "<group>"; };
 		A1F120D21733052200363A8F /* ALActionBlocks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ALActionBlocks.h; sourceTree = "<group>"; };
@@ -127,6 +130,8 @@
 				A10AE4811745784800EEC209 /* UIBarButtonItem+ALActionBlocks.m */,
 				A1F120CF1733050400363A8F /* UIControl+ALActionBlocks.h */,
 				A1F120D01733050400363A8F /* UIControl+ALActionBlocks.m */,
+				A1C48A13181060B500734781 /* UIGestureRecognizer+ALActionBlocks.h */,
+				A1C48A14181060B500734781 /* UIGestureRecognizer+ALActionBlocks.m */,
 			);
 			name = ALActionBlocks;
 			path = ../../ALActionBlocks;
@@ -199,6 +204,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				A1AE07CD170741AC0028A95E /* main.m in Sources */,
+				A1C48A15181060B500734781 /* UIGestureRecognizer+ALActionBlocks.m in Sources */,
 				A1AE07D1170741AC0028A95E /* ALAppDelegate.m in Sources */,
 				A1AE07DA170741AC0028A95E /* ALViewController.m in Sources */,
 				A1F120D11733050400363A8F /* UIControl+ALActionBlocks.m in Sources */,

diff --git a/Demo/ALActionBlocks/ALViewController.m b/Demo/ALActionBlocks/ALViewController.m
@@ -39,7 +39,6 @@ - (void)viewDidLoad {
 
     UISegmentedControl *segmentedControl = [[UISegmentedControl alloc] initWithItems:@[@"One", @"Two", @"Three"]];
     segmentedControl.frame = CGRectMake(88, 220 + 64, 143, 30);
-    segmentedControl.segmentedControlStyle = UISegmentedControlStyleBar;
     [segmentedControl handleControlEvents:UIControlEventValueChanged withBlock:^(id weakControl) {
         NSLog(@"selected segment: %@", [segmentedControl titleForSegmentAtIndex:segmentedControl.selectedSegmentIndex]);
         if (segmentedControl.selectedSegmentIndex == 2) {
@@ -65,6 +64,12 @@ - (void)viewDidLoad {
         NSLog(@"pow!");
     }];
     [toolbar setItems:@[powButton]];
+
+    __weak ALViewController *wSelf = self;
+    UIPanGestureRecognizer *gr = [[UIPanGestureRecognizer alloc] initWithBlock:^(UIPanGestureRecognizer *weakGR) {
+        NSLog(@"pan %@", NSStringFromCGPoint([weakGR locationInView:wSelf.view]));
+    }];
+    [self.view addGestureRecognizer:gr];
 }
 
 @end