Merge branch 'master' of https://github.com/mikeMTOL/UIBarButtonItem-Badge

Conflicts:
	Demo/TestBadge/TestBadge/MasterViewController.m
	UIBarButtonItem+Badge.m

Author: mike

Demo/TestBadge/TestBadge/MasterViewController.m

@@ -32,18 +32,29 @@ - (void)viewDidLoad
     UIBarButtonItem *addButton = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemAdd target:self action:@selector(insertNewObject:)];
     self.navigationItem.rightBarButtonItem = addButton;
 
-    // Build your regular UIBarButtonItem with Custom View
-    UIImage *image = [UIImage imageNamed:@"someImage"];
-    UIButton *button = [UIButton buttonWithType:UIButtonTypeCustom];
-    button.frame = CGRectMake(0,0,image.size.width, image.size.height);
-    [button addTarget:self action:@selector(buttonPress:) forControlEvents:UIControlEventTouchDown];
-    [button setBackgroundImage:image forState:UIControlStateNormal];
+//    // Build your regular UIBarButtonItem with Custom View
+//    UIImage *image = [UIImage imageNamed:@"someImage"];
+//    UIButton *button = [UIButton buttonWithType:UIButtonTypeCustom];
+//    button.frame = CGRectMake(0,0,image.size.width, image.size.height);
+//    [button addTarget:self action:@selector(buttonPress:) forControlEvents:UIControlEventTouchDown];
+//    [button setBackgroundImage:image forState:UIControlStateNormal];
+//    
+//    // Make BarButton Item
+//    UIBarButtonItem *navLeftButton = [[UIBarButtonItem alloc] initWithCustomView:button];
+//    self.navigationItem.leftBarButtonItem = navLeftButton;
+//    self.navigationItem.leftBarButtonItem.badgeValue = @"1";
+//    self.navigationItem.leftBarButtonItem.badgeBGColor = self.navigationController.navigationBar.tintColor;
 
-    // Make BarButton Item
-    UIBarButtonItem *navLeftButton = [[UIBarButtonItem alloc] initWithCustomView:button];
-    self.navigationItem.leftBarButtonItem = navLeftButton;
-    self.navigationItem.leftBarButtonItem.badgeValue = @"0";
-    self.navigationItem.leftBarButtonItem.badgeBGColor = self.navigationController.navigationBar.tintColor;
+    // new method of adding badges
+    UIImage *image2 = [UIImage imageNamed:@"someImage"];
+    UIBarButtonItem *navRightButton = [[UIBarButtonItem alloc] initWithImage:image2
+                                                                      style:UIBarButtonItemStylePlain
+                                                                     target:self
+                                                                     action:@selector(buttonPress:)];
+    self.navigationItem.leftBarButtonItem = navRightButton;
+    self.navigationItem.leftBarButtonItem.badgeValue = @"2";
+    self.navigationItem.leftBarButtonItem.badgeBGColor = [UIColor orangeColor];
+
 
     [NSTimer scheduledTimerWithTimeInterval:1.0
                                      target:self

README.md

@@ -56,6 +56,18 @@ self.navigationItem.leftBarButtonItem = navLeftButton;
 self.navigationItem.leftBarButtonItem.badgeValue = @"1";
 ```
 
+A new merge now enables adding badge without a custom view
+``` objective-c
+UIImage *image = [UIImage imageNamed:@"someImage"];
+UIBarButtonItem *navLeftButton = [[UIBarButtonItem alloc] initWithImage:image
+                                                                  style:UIBarButtonItemStylePlain
+                                                                 target:self
+                                                                 action:@selector(buttonPress:)];
+self.navigationItem.leftBarButtonItem = navLeftButton;
+self.navigationItem.leftBarButtonItem.badgeValue = @"1";
+```
+
+
 Useful properties
 ---------------
 

UIBarButtonItem+Badge.m

@@ -29,18 +29,29 @@ @implementation UIBarButtonItem (Badge)
 
 - (void)badgeInit
 {
+    UIView *superview = nil;
+    CGFloat defaultOriginX = 0;
+    if (self.customView) {
+        superview = self.customView;
+        defaultOriginX = superview.frame.size.width - self.badge.frame.size.width/2;
+        // Avoids badge to be clipped when animating its scale
+        superview.clipsToBounds = NO;
+    } else if ([self respondsToSelector:@selector(view)] && [(id)self view]) {
+        superview = [(id)self view];
+        defaultOriginX = superview.frame.size.width - self.badge.frame.size.width;
+    }
+    [superview addSubview:self.badge];
+    
     // Default design initialization
     self.badgeBGColor   = [UIColor redColor];
     self.badgeTextColor = [UIColor whiteColor];
     self.badgeFont      = [UIFont systemFontOfSize:12.0];
     self.badgePadding   = 6;
     self.badgeMinSize   = 8;
-    self.badgeOriginX   = self.customView.frame.size.width - self.badge.frame.size.width/2;
+    self.badgeOriginX   = defaultOriginX;
     self.badgeOriginY   = -4;
     self.shouldHideBadgeAtZero = YES;
     self.shouldAnimateBadge = YES;
-    // Avoids badge to be clipped when animating its scale
-    self.customView.clipsToBounds = NO;
 }
 
 #pragma mark - Utility methods

UIBarButtonItem-Badge.podspec

@@ -0,0 +1,19 @@
+Pod::Spec.new do |s|
+
+  s.name         = "UIBarButtonItem-Badge"
+  s.version      = "0.0.1"
+  s.summary      = "Create a BarButtonItem with a badge on top. Easily customizable. Your BarButtonItem can be any custom view you wish for. The badge on top can display any number or string of any size or length."
+
+  s.homepage     = "https://github.com/mikeMTOL/UIBarButtonItem-Badge"
+  s.license      = 'MIT'
+
+  s.author       = { "Mike" => "http://mikethinkingoutloud.com" }
+
+  s.source       = { :git => "https://github.com/mikeMTOL/UIBarButtonItem-Badge.git" }
+
+  s.platform     = :ios, '6.0'
+
+  s.source_files = 'UIBarButtonItem+Badge.{h,m}', 'UIButton+Badge.{h,m}'
+  s.requires_arc = true
+
+end