Add SCL prefix to ValidationBlock, avoid conflicts with other libs

dogo · dogo · commit fe5345361984 · 2014-11-14T12:03:33.000-02:00
diff --git a/SCLAlertView/SCLAlertView.h b/SCLAlertView/SCLAlertView.h
@@ -155,7 +155,7 @@ typedef NS_ENUM(NSInteger, SCLAlertViewBackground)
  * @param validationBlock A block of code that will allow you to validate fields or do any other logic you may want to do to determine if the alert should be dismissed or not. Inside of this block, return a BOOL indicating whether or not the action block should be called and the alert dismissed.
  * @param action A block of code to be executed when the button is pressed and validation passes.
  */
-- (SCLButton *)addButton:(NSString *)title validationBlock:(ValidationBlock)validationBlock actionBlock:(SCLActionBlock)action;
+- (SCLButton *)addButton:(NSString *)title validationBlock:(SCLValidationBlock)validationBlock actionBlock:(SCLActionBlock)action;
 
 /** Add a Button with a title, a target and a selector to handle when the button is pressed.
  *
diff --git a/SCLAlertView/SCLAlertView.m b/SCLAlertView/SCLAlertView.m
@@ -396,7 +396,7 @@ - (SCLButton *)addButton:(NSString *)title actionBlock:(SCLActionBlock)action
     return btn;
 }
 
-- (SCLButton *)addButton:(NSString *)title validationBlock:(ValidationBlock)validationBlock actionBlock:(SCLActionBlock)action
+- (SCLButton *)addButton:(NSString *)title validationBlock:(SCLValidationBlock)validationBlock actionBlock:(SCLActionBlock)action
 {
     SCLButton *btn = [self addButton:title actionBlock:action];
     btn.validationBlock = validationBlock;
diff --git a/SCLAlertView/SCLButton.h b/SCLAlertView/SCLButton.h
@@ -11,7 +11,7 @@
 @interface SCLButton : UIButton
 
 typedef void (^SCLActionBlock)(void);
-typedef BOOL (^ValidationBlock)(void);
+typedef BOOL (^SCLValidationBlock)(void);
 typedef NSDictionary* (^CompleteButtonFormatBlock)(void);
 typedef NSDictionary* (^ButtonFormatBlock)(void);
 
@@ -39,7 +39,7 @@ typedef NS_ENUM(NSInteger, SCLActionType)
  *
  * TODO
  */
-@property (nonatomic, copy) ValidationBlock validationBlock;
+@property (nonatomic, copy) SCLValidationBlock validationBlock;
 
 /** Set Complete button format block.
  *

Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ typedef NS_ENUM(NSInteger, SCLAlertViewBackground)`
`155`	`155`	`* @param validationBlock A block of code that will allow you to validate fields or do any other logic you may want to do to determine if the alert should be dismissed or not. Inside of this block, return a BOOL indicating whether or not the action block should be called and the alert dismissed.`
`156`	`156`	`* @param action A block of code to be executed when the button is pressed and validation passes.`
`157`	`157`	`*/`
`158`		`-- (SCLButton )addButton:(NSString )title validationBlock:(ValidationBlock)validationBlock actionBlock:(SCLActionBlock)action;`
	`158`	`+- (SCLButton )addButton:(NSString )title validationBlock:(SCLValidationBlock)validationBlock actionBlock:(SCLActionBlock)action;`
`159`	`159`
`160`	`160`	`/** Add a Button with a title, a target and a selector to handle when the button is pressed.`
`161`	`161`	`*`
Original file line number	Diff line number	Diff line change
`@@ -396,7 +396,7 @@ - (SCLButton )addButton:(NSString )title actionBlock:(SCLActionBlock)action`
`396`	`396`	`return btn;`
`397`	`397`	`}`
`398`	`398`
`399`		`-- (SCLButton )addButton:(NSString )title validationBlock:(ValidationBlock)validationBlock actionBlock:(SCLActionBlock)action`
	`399`	`+- (SCLButton )addButton:(NSString )title validationBlock:(SCLValidationBlock)validationBlock actionBlock:(SCLActionBlock)action`
`400`	`400`	`{`
`401`	`401`	`SCLButton *btn = [self addButton:title actionBlock:action];`
`402`	`402`	`btn.validationBlock = validationBlock;`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`@interface SCLButton : UIButton`
`12`	`12`
`13`	`13`	`typedef void (^SCLActionBlock)(void);`
`14`		`-typedef BOOL (^ValidationBlock)(void);`
	`14`	`+typedef BOOL (^SCLValidationBlock)(void);`
`15`	`15`	`typedef NSDictionary* (^CompleteButtonFormatBlock)(void);`
`16`	`16`	`typedef NSDictionary* (^ButtonFormatBlock)(void);`
`17`	`17`
`@@ -39,7 +39,7 @@ typedef NS_ENUM(NSInteger, SCLActionType)`
`39`	`39`	`*`
`40`	`40`	`* TODO`
`41`	`41`	`*/`
`42`		`-@property (nonatomic, copy) ValidationBlock validationBlock;`
	`42`	`+@property (nonatomic, copy) SCLValidationBlock validationBlock;`
`43`	`43`
`44`	`44`	`/** Set Complete button format block.`
`45`	`45`	`*`