Merge pull request #70 from wzs/master

Minor icon and button customization fixes
dogo · Feb 18, 2015 · f4d7917 · f4d7917
2 parents 60a57d7 + de63437
commit f4d7917
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 11 deletions.
diff --git a/SCLAlertView/SCLAlertView.h b/SCLAlertView/SCLAlertView.h
@@ -108,13 +108,20 @@ typedef NS_ENUM(NSInteger, SCLAlertViewBackground)
  */
 @property (nonatomic, copy) SCLAttributedFormatBlock attributedFormatBlock;
 
-/** Set button format block.
+/** Set Complete button format block.
  *
  * Holds the button format block. 
- * Support keys : backgroundColor, textColor
+ * Support keys : backgroundColor, borderColor, textColor
  */
 @property (nonatomic, copy) CompleteButtonFormatBlock completeButtonFormatBlock;
 
+/** Set button format block.
+ *
+ * Holds the button format block.
+ * Support keys : backgroundColor, borderColor, textColor
+ */
+@property (nonatomic, copy) ButtonFormatBlock buttonFormatBlock;
+
 /** Hide animation type
  *
  * Holds the hide animation type.
@@ -149,6 +156,12 @@ typedef NS_ENUM(NSInteger, SCLAlertViewBackground)
  */
 @property (nonatomic, strong) UIColor *backgroundViewColor;
 
+/** Set custom tint color for icon image.
+ *
+ * SCLAlertView icon tint color
+ */
+@property (nonatomic, strong) UIColor *iconTintColor;
+
 /** Warns that alerts is gone
  *
  * Warns that alerts is gone using block

diff --git a/SCLAlertView/SCLAlertView.m b/SCLAlertView/SCLAlertView.m
@@ -529,6 +529,12 @@ - (SCLButton *)addDoneButtonWithTitle:(NSString *)title
 - (SCLButton *)addButton:(NSString *)title actionBlock:(SCLActionBlock)action
 {
     SCLButton *btn = [self addButton:title];
+
+    if (_buttonFormatBlock != nil)
+    {
+        btn.buttonFormatBlock = _buttonFormatBlock;
+    }
+
     btn.actionType = Block;
     btn.actionBlock = action;
     [btn addTarget:self action:@selector(buttonTapped:) forControlEvents:UIControlEventTouchUpInside];
@@ -760,7 +766,11 @@ -(SCLAlertViewResponder *)showTitle:(UIViewController *)vc image:(UIImage *)imag
     }
     else
     {
-        self.circleIconImageView.image  = iconImage;
+        if (self.iconTintColor) {
+            self.circleIconImageView.tintColor = self.iconTintColor;
+            iconImage  = [iconImage imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
+        }
+        self.circleIconImageView.image = iconImage;
     }
 
     for (UITextField *textField in _inputs)
@@ -770,6 +780,12 @@ -(SCLAlertViewResponder *)showTitle:(UIViewController *)vc image:(UIImage *)imag
 
     for (SCLButton *btn in _buttons)
     {
+        if (style == Warning)
+        {
+            [btn setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
+        }
+        btn.defaultBackgroundColor = viewColor;
+
         if (btn.completeButtonFormatBlock != nil)
         {
             [btn parseConfig:btn.completeButtonFormatBlock()];
@@ -778,14 +794,6 @@ -(SCLAlertViewResponder *)showTitle:(UIViewController *)vc image:(UIImage *)imag
         {
             [btn parseConfig:btn.buttonFormatBlock()];
         }
-        else
-        {
-            btn.defaultBackgroundColor = viewColor;
-        }
-        if (style == Warning)
-        {
-            [btn setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
-        }
     }
 
     // Adding duration