Permalink
Browse files

Updated button name from white to default. Updated ordering.

  • Loading branch information...
1 parent 0ca05b4 commit 92651ea5dbf1aabac3f8f3d6c8109eb14489821e @alexanderjarvis alexanderjarvis committed Aug 19, 2012
Showing with 13 additions and 13 deletions.
  1. +4 −4 BButton/BButton.h
  2. +9 −9 BButton/BButton.m
View
8 BButton/BButton.h
@@ -9,12 +9,12 @@
#import <UIKit/UIKit.h>
typedef enum {
- BButtonTypePrimary = 0,
+ BButtonTypeDefault = 0,
+ BButtonTypePrimary,
+ BButtonTypeInfo,
+ BButtonTypeSuccess,
BButtonTypeWarning,
BButtonTypeDanger,
- BButtonTypeSuccess,
- BButtonTypeInfo,
- BButtonTypeWhite,
BButtonTypeInverse,
} BButtonType;
View
18 BButton/BButton.m
@@ -86,23 +86,23 @@ - (UIColor *) color {
- (void)setType:(BButtonType)type {
UIColor *color = [UIColor colorWithRed:0.00f green:0.33f blue:0.80f alpha:1.00f];
switch (type) {
+ case BButtonTypeDefault:
+ color = [UIColor colorWithRed:0.85f green:0.85f blue:0.85f alpha:1.00f];
+ break;
case BButtonTypePrimary:
color = [UIColor colorWithRed:0.00f green:0.33f blue:0.80f alpha:1.00f];
break;
- case BButtonTypeWarning:
- color = [UIColor colorWithRed:0.97f green:0.58f blue:0.02f alpha:1.00f];
- break;
- case BButtonTypeDanger:
- color = [UIColor colorWithRed:0.74f green:0.21f blue:0.18f alpha:1.00f];
+ case BButtonTypeInfo:
+ color = [UIColor colorWithRed:0.18f green:0.59f blue:0.71f alpha:1.00f];
break;
case BButtonTypeSuccess:
color = [UIColor colorWithRed:0.32f green:0.64f blue:0.32f alpha:1.00f];
break;
- case BButtonTypeInfo:
- color = [UIColor colorWithRed:0.18f green:0.59f blue:0.71f alpha:1.00f];
+ case BButtonTypeWarning:
+ color = [UIColor colorWithRed:0.97f green:0.58f blue:0.02f alpha:1.00f];
break;
- case BButtonTypeWhite:
- color = [UIColor colorWithRed:0.90f green:0.90f blue:0.90f alpha:1.00f];
+ case BButtonTypeDanger:
+ color = [UIColor colorWithRed:0.74f green:0.21f blue:0.18f alpha:1.00f];
break;
case BButtonTypeInverse:
color = [UIColor colorWithRed:0.13f green:0.13f blue:0.13f alpha:1.00f];

0 comments on commit 92651ea

Please sign in to comment.