UI7BorderedRoundedRectButton

UI7Kit.podspec

@@ -1,11 +1,11 @@
 Pod::Spec.new do |s|
   s.name         = "UI7Kit"
-  s.version      = "0.8.25"
+  s.version      = "0.8.26"
   s.summary      = "UI7Kit is a GUI toolkit to implement iOS7 look & feel UIKit under iOS5/iOS6. It is also supported that patching UIKit to UI7Kit in runtime."
   s.homepage     = "https://github.com/youknowone/UI7Kit"
   s.license      = "2-clause BSD"
   s.author       = { "Jeong YunWon" => "[email protected]" }
-  s.source       = { :git => "https://github.com/youknowone/UI7Kit.git", :tag => "0.8.25" }
+  s.source       = { :git => "https://github.com/youknowone/UI7Kit.git", :tag => "0.8.26" }
 
   s.platform     = :ios, '5.0'
   s.header_dir = "UI7Kit"

UI7Kit/UI7Button.h

@@ -20,3 +20,11 @@
 @property(copy,nonatomic) NSNumber *cornerRadius;
 
 @end
+
+
+@interface UI7BorderedRoundedRectButton : UI7Button
+
+@property(copy,nonatomic) NSNumber *cornerRadius;
+@property(copy,nonatomic) NSNumber *borderWidth;
+
+@end

UI7Kit/UI7Button.m

@@ -173,9 +173,6 @@ - (id)initWithCoder:(NSCoder *)aDecoder {
         NSDictionary *statefulContents = [aDecoder decodeObjectForKey:@"UIButtonStatefulContent"];
         NSObject *normalStatefulContent = statefulContents[@0];
         if ([normalStatefulContent.titleColor isEqual:UI7ButtonDefaultTitleColor]) {
-            [self setTitleColor:nil forState:UIControlStateNormal];
-            self.___textTitleColor = nil;
-        } else {
             self.___textTitleColor = [self titleColorForState:UIControlStateNormal];
         }
     }
@@ -276,3 +273,56 @@ - (void)tintColorDidChange {
 }
 
 @end
+
+
+@implementation UI7BorderedRoundedRectButton
+
+- (void)_roundedRectButtonInit {
+    self.layer.cornerRadius = self.cornerRadius ? self.cornerRadius.floatValue : 6.0f;
+    self.layer.borderWidth = self.borderWidth ? self.borderWidth.floatValue : 1.0f;
+}
+
+- (void)_tintColorUpdated {
+    UIColor *tintColor = self.tintColor;
+    if (tintColor == nil) return;
+
+    self.layer.borderColor = tintColor.CGColor;
+    UIColor *textTitleColor = self.___textTitleColor;
+    if (tintColor) {
+        textTitleColor = tintColor;
+    }
+    [self __setTitleColor:textTitleColor forState:UIControlStateNormal];
+    UIColor *highlightedTextTitleColor = textTitleColor.highligtedColor;
+    [self __setTitleColor:highlightedTextTitleColor forState:UIControlStateHighlighted];
+    [self __setTitleColor:highlightedTextTitleColor forState:UIControlStateSelected];
+}
+
+- (id)initWithCoder:(NSCoder *)aDecoder {
+    self = [super initWithCoder:aDecoder];
+    self.___backgroundColor = [aDecoder decodeObjectForKey:@"UIBackgroundColor"];
+    [self _roundedRectButtonInit];
+    return self;
+}
+
+- (id)initWithFrame:(CGRect)frame {
+    self = [super initWithFrame:frame];
+    [self _roundedRectButtonInit];
+    return self;
+}
+
+- (void)setBackgroundColor:(UIColor *)backgroundColor {
+    self.___backgroundColor = backgroundColor;
+    [self _tintColorUpdated];
+}
+
+- (void)setTintColor:(UIColor *)tintColor {
+    [super setTintColor:tintColor];
+    [self _tintColorUpdated]; // for iOS6 SDK + iOS7
+}
+
+- (void)tintColorDidChange {
+    [super tintColorDidChange];
+    [self _tintColorUpdated]; // for iOS7
+}
+
+@end