Improve pull request dogo#85

dogo · dogo · commit b87eb0670b9f · 2015-03-19T22:57:37.000-03:00
diff --git a/SCLAlertView/SCLButton.m b/SCLAlertView/SCLButton.m
@@ -64,14 +64,18 @@ - (void)parseConfig:(NSDictionary *)buttonConfig
     {
         self.defaultBackgroundColor = buttonConfig[@"backgroundColor"];
     }
-    if (buttonConfig[@"borderColor"])
+    if (buttonConfig[@"textColor"])
+    {
+        [self setTitleColor:buttonConfig[@"textColor"] forState:UIControlStateNormal];
+    }
+    if ((buttonConfig[@"borderColor"]) && (buttonConfig[@"borderWidth"]))
     {
         self.layer.borderColor = ((UIColor*)buttonConfig[@"borderColor"]).CGColor;
-        self.layer.borderWidth = self.layer.borderWidth ?: 2.0f;
+        self.layer.borderWidth = [buttonConfig[@"borderWidth"] floatValue];
     }
-    if (buttonConfig[@"textColor"])
+    else if (buttonConfig[@"borderWidth"])
     {
-        [self setTitleColor:buttonConfig[@"textColor"] forState:UIControlStateNormal];
+        self.layer.borderWidth = [buttonConfig[@"borderWidth"] floatValue];
     }
 }
 
diff --git a/SCLAlertViewExample/ViewController.m b/SCLAlertViewExample/ViewController.m
@@ -40,14 +40,13 @@ - (IBAction)showSuccess:(id)sender
     
     SCLButton *button = [alert addButton:@"First Button" target:self selector:@selector(firstButton)];
     
-    button.layer.borderWidth = 2.0f;
-    
     button.buttonFormatBlock = ^NSDictionary* (void)
     {
         NSMutableDictionary *buttonConfig = [[NSMutableDictionary alloc] init];
         
         buttonConfig[@"backgroundColor"] = [UIColor whiteColor];
         buttonConfig[@"textColor"] = [UIColor blackColor];
+        buttonConfig[@"borderWidth"] = [NSNumber numberWithFloat:2.0f];
         buttonConfig[@"borderColor"] = [UIColor greenColor];
         
         return buttonConfig;
@@ -141,6 +140,7 @@ - (IBAction)showAdvanced:(id)sender
         
         buttonConfig[@"backgroundColor"] = [UIColor greenColor];
         buttonConfig[@"borderColor"] = [UIColor blackColor];
+        buttonConfig[@"borderWidth"] = @"1.0f";
         buttonConfig[@"textColor"] = [UIColor blackColor];
         
         return buttonConfig;

Original file line number	Diff line number	Diff line change
`@@ -64,14 +64,18 @@ - (void)parseConfig:(NSDictionary *)buttonConfig`
`64`	`64`	`{`
`65`	`65`	`self.defaultBackgroundColor = buttonConfig[@"backgroundColor"];`
`66`	`66`	`}`
`67`		`- if (buttonConfig[@"borderColor"])`
	`67`	`+ if (buttonConfig[@"textColor"])`
	`68`	`+ {`
	`69`	`+ [self setTitleColor:buttonConfig[@"textColor"] forState:UIControlStateNormal];`
	`70`	`+ }`
	`71`	`+ if ((buttonConfig[@"borderColor"]) && (buttonConfig[@"borderWidth"]))`
`68`	`72`	`{`
`69`	`73`	`self.layer.borderColor = ((UIColor*)buttonConfig[@"borderColor"]).CGColor;`
`70`		`- self.layer.borderWidth = self.layer.borderWidth ?: 2.0f;`
	`74`	`+ self.layer.borderWidth = [buttonConfig[@"borderWidth"] floatValue];`
`71`	`75`	`}`
`72`		`- if (buttonConfig[@"textColor"])`
	`76`	`+ else if (buttonConfig[@"borderWidth"])`
`73`	`77`	`{`
`74`		`- [self setTitleColor:buttonConfig[@"textColor"] forState:UIControlStateNormal];`
	`78`	`+ self.layer.borderWidth = [buttonConfig[@"borderWidth"] floatValue];`
`75`	`79`	`}`
`76`	`80`	`}`
`77`	`81`