fixed conflict

CWStatusBarNotification.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "CWStatusBarNotification"
-  s.version      = "2.3.1"
+  s.version      = "2.3.2"
   s.summary      = "A library that creates status bar notifications."
   s.description  = "CWStatusBarNotification is a library allows you to present a beautiful text-based notification in the status bar."
   s.homepage     = "https://github.com/cezarywojcik/CWStatusBarNotification"

CWStatusBarNotification/CWStatusBarNotification.h

@@ -143,8 +143,9 @@ typedef NS_ENUM(NSInteger, CWNotificationAnimationType) {
  */
 @property (assign, nonatomic) BOOL multiline;
 /**
- * The supported interface orientations. Default value is 
- * @c UIInterfaceOrientationMaskAll.
+ * The supported interface orientations. Default value is the
+ * @c supportedInterfaceOrientations value of the root view controller of the
+ * application.
  */
 @property (nonatomic) UIInterfaceOrientationMask supportedInterfaceOrientations;
 /**

CWStatusBarNotification/CWStatusBarNotification.m

@@ -194,13 +194,17 @@ static void cancel_delayed_block(CWDelayedBlockHandle delayedHandle)
     self = [super init];
     if (self) {
         // set default
-        self.notificationLabelBackgroundColor = [[UIApplication sharedApplication] delegate].window.tintColor;
+        if ([[UIApplication sharedApplication] delegate].window != nil) {
+            self.notificationLabelBackgroundColor = [[UIApplication sharedApplication] delegate].window.tintColor;
+        } else {
+            self.notificationLabelBackgroundColor = [UIColor blackColor];
+        }
         self.notificationLabelTextColor = [UIColor whiteColor];
         self.notificationLabelFont = [UIFont systemFontOfSize:FONT_SIZE];
         self.notificationLabelHeight = 0.0;
         self.customView = nil;
         self.multiline = NO;
-        self.supportedInterfaceOrientations = UIInterfaceOrientationMaskAll;
+        self.supportedInterfaceOrientations = [UIApplication sharedApplication].keyWindow.rootViewController.supportedInterfaceOrientations;
         self.notificationAnimationDuration = 0.25;
         self.notificationStyle = CWNotificationStyleStatusBarNotification;
         self.notificationAnimationInStyle = CWNotificationAnimationStyleBottom;
@@ -255,6 +259,27 @@ static void cancel_delayed_block(CWDelayedBlockHandle delayedHandle)
     return 0.0f;
 }
 
+- (CGFloat)getNavigationBarHeight
+{
+    if (UIInterfaceOrientationIsPortrait([UIApplication sharedApplication].statusBarOrientation) ||
+        UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
+        return 44.0f;
+    }
+    return 30.0f;
+}
+
+- (CGFloat)getNotificationLabelHeight
+{
+    switch (self.notificationStyle) {
+        case CWNotificationStyleStatusBarNotification:
+            return [self getStatusBarHeight];
+        case CWNotificationStyleNavigationBarNotification:
+            return [self getStatusBarHeight] + [self getNavigationBarHeight];
+        default:
+            return [self getStatusBarHeight];
+    }
+}
+
 - (CGRect)getNotificationLabelTopFrame
 {
     return CGRectMake(0, [self getStatusBarOffset] + -1*[self getNotificationLabelHeight], [self getStatusBarWidth], [self getNotificationLabelHeight]);
@@ -280,27 +305,6 @@ static void cancel_delayed_block(CWDelayedBlockHandle delayedHandle)
     return CGRectMake(0, [self getStatusBarOffset], [self getStatusBarWidth], [self getNotificationLabelHeight]);
 }
 
-- (CGFloat)getNavigationBarHeight
-{
-    if (UIInterfaceOrientationIsPortrait([UIApplication sharedApplication].statusBarOrientation) ||
-        UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
-        return 44.0f;
-    }
-    return 30.0f;
-}
-
-- (CGFloat)getNotificationLabelHeight
-{
-    switch (self.notificationStyle) {
-        case CWNotificationStyleStatusBarNotification:
-            return [self getStatusBarHeight];
-        case CWNotificationStyleNavigationBarNotification:
-            return [self getStatusBarHeight] + [self getNavigationBarHeight];
-        default:
-            return [self getStatusBarHeight];
-    }
-}
-
 # pragma mark - screen orientation change
 
 - (void)updateStatusBarFrame
@@ -360,7 +364,7 @@ static void cancel_delayed_block(CWDelayedBlockHandle delayedHandle)
     [view setTranslatesAutoresizingMaskIntoConstraints:NO];
     [self.customView addSubview:view];
 
-    // Setup Auto Layout constaints so that the custom view that is added is constained to be the same
+    // Setup Auto Layout constaints so that the custom view that is added is consrtained to be the same
     // size as its superview, whose frame will be altered
     [self.customView addConstraint:[NSLayoutConstraint constraintWithItem:view attribute:NSLayoutAttributeTrailing relatedBy:NSLayoutRelationEqual toItem:self.customView attribute:NSLayoutAttributeTrailing multiplier:1.0 constant:0.0]];
     [self.customView addConstraint:[NSLayoutConstraint constraintWithItem:view attribute:NSLayoutAttributeLeading relatedBy:NSLayoutRelationEqual toItem:self.customView attribute:NSLayoutAttributeLeading multiplier:1.0 constant:0.0]];
@@ -526,7 +530,7 @@ static void cancel_delayed_block(CWDelayedBlockHandle delayedHandle)
         self.isCustomView = YES;
         self.notificationIsShowing = YES;
 
-        // create UIWindow
+        // create window
         [self createNotificationWindow];
 
         // setup view

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014 Cezary Wojcik <http://www.cezarywojcik.com>
+Copyright (c) 2015 Cezary Wojcik <http://www.cezarywojcik.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -2,7 +2,154 @@
 
 [![Build Status](https://travis-ci.org/cezarywojcik/CWStatusBarNotification.png?branch=master)](https://travis-ci.org/cezarywojcik/CWStatusBarNotification)
 
-**NOTE:** You can find a `Swift` implementation of this library [in the swift branch of this repo](https://github.com/cezarywojcik/CWStatusBarNotification/tree/swift). This version is currently somewhat outdated, but a new one with Swift 2.0 will be coming soon!
+**NOTE:** You can find a **Swift 2.0** implementation of this library [in the swift branch of this repo](https://github.com/cezarywojcik/CWStatusBarNotification/tree/swift). 
+
+`CWStatusBarNotification` is a library that allows you to easily create text-based notifications that appear on the status bar.
+
+You can find the documentation [here](http://cocoadocs.org/docsets/CWStatusBarNotification/).
+
+![demo](screenshots/demo.gif)
+
+## Requirements
+
+`CWStatusBarNotification` uses ARC and requires iOS 7.0+.
+
+Works for iPhone and iPad.
+
+## Installation
+
+### CocoaPods
+
+`pod 'CWStatusBarNotification', '~> 2.3.2'`
+
+### Manual
+
+Copy the folder `CWStatusBarNotification` to your project.
+
+## Usage
+
+Firstly, you need the following import statement:
+
+```objc
+#import "CWStatusBarNotification.h"
+```
+
+Now, you need to create a `CWStatusBarNotification` object. It is recommended that you do so by attaching it as a property to a `UIViewController`.
+
+```objc
+CWStatusBarNotification *notification = [CWStatusBarNotification new];
+```
+
+After you have a `CWStatusBarNotification` object, you can simply call the `displayNotificationMessage:forDuration:` method:
+
+```objc
+[self.notification displayNotificationWithMessage:@"Hello, World!"
+                   forDuration:1.0f];
+```
+
+If you prefer to manually choose when to display and dismiss the notification, you can do so as well:
+
+```objc
+[self.notification displayNotificationWithMessage:@"Hello" completion:nil];
+// wait until you need to dismiss
+[self.notification dismissNotification];
+```
+
+### Behavior on Tap
+
+The default behavior when the notification is tapped is to dismiss it. However, you can override this behavior by setting the `onTapNotification` block to something different. 
+
+For example:
+
+```objc
+self.notification.notificationTappedBlock = ^(void) {
+    NSLog(@"notification tapped");
+    // more code here
+};
+```
+
+Note that overriding this block means that the notification will no longer be dismissed when tapped. If you want the notification to still dismiss when tapped, make sure to implement the following when overriding the block:
+
+```objc
+__weak typeof(self) weakSelf = self;
+self.notification.notificationTappedBlock = ^(void) {
+    if (!weakSelf.notificationIsDismissing) {
+        [weakSelf dismissNotification];
+        // more code here
+    }
+};
+```
+
+## Customizing Appearance
+
+First of all, you can customize the background color and text color using the following properties: `notificationLabelBackgroundColor` and `notificationLabelTextColor`.
+
+Example:
+
+```objc
+notification.notificationLabelBackgroundColor = [UIColor blackColor];
+notification.notificationLabelTextColor = [UIColor greenColor];
+```
+
+![custom colors](screenshots/ss1.gif)
+
+The default value of `notificationLabelBackgroundColor` is `[[UIApplication sharedApplication] delegate].window.tintColor`.
+
+The default value of `notification.notificationLabelTextColor` is `[UIColor whiteColor]`.
+
+Finally, you can also choose from two styles - a notification the size of the status bar, or a notification the size of the status bar and a navigation bar. Simply change the `notificationStyle` property of the `CWStatusBarNotification` object to either `CWNotificationStyleStatusBarNotification` or `CWNotificationStyleNavigationBarNotification`.
+
+![custom style](screenshots/ss2.gif)
+
+The default value of `notificationStyle` is `CWNotificationStyleStatusBarNotification`.
+
+## Customizing Animation
+
+There are two properties that determine the animation style of the notification: `notificationAnimationInStyle` and `notificationAnimationOutStyle`. Each can take on one of four values:
+
+* `CWNotificationAnimationStyleTop`
+* `CWNotificationAnimationStyleBottom`
+* `CWNotificationAnimationStyleLeft`
+* `CWNotificationAnimationStyleRight`
+
+The `notificationAnimationInStyle` describes where the notification comes from, whereas the `notificationAnimationOutStyle` describes where the notification will go.
+
+The default value for `notificationAnimationInStyle` is `CWNotificationAnimationStyleTop`.
+
+The default value for `notificationAnimationOutStyle` is `CWNotificationAnimationStyleTop`.
+
+## Presenting a Custom View
+
+As of version `2.2.0`, you can choose to present a custom view in lieu of presenting a simple message. The demo project shows a simple way in which you can make a custom NIB file and present it as the notification view using the `displayNotificationWithView:forDuration:` method:
+
+```objc
+UIView *view = [[NSBundle mainBundle] loadNibNamed:@"CustomView" owner:nil options:nil][0];
+[self.notification displayNotificationWithView:view forDuration:self.sliderDuration.value];
+```
+   
+You can also display the notification and choose when to dismiss it as usual:
+
+```objc
+[self.notification displayNotificationWithView:view completion:nil];
+// wait until you need to dismiss
+[self.notification dismissNotification];
+```
+
+
+### Additional Remarks
+
+The notifications will work in both screen orientations, however, screen rotation while a notification is displayed is not yet fully supported.
+
+## Apps Using This Library
+
+If you would like for your app to be featured here, [contact me](http://cezarywojcik.com/contact) and I would love to hear about your app!
+
+=======
+# CWStatusBarNotification
+
+[![Build Status](https://travis-ci.org/cezarywojcik/CWStatusBarNotification.png?branch=master)](https://travis-ci.org/cezarywojcik/CWStatusBarNotification)
+
+**NOTE:** You can find a **Swift 2.0** implementation of this library [in the swift branch of this repo](https://github.com/cezarywojcik/CWStatusBarNotification/tree/swift). 
 
 `CWStatusBarNotification` is a library that allows you to easily create text-based notifications that appear on the status bar.
 
@@ -142,17 +289,18 @@ The notifications will work in both screen orientations, however, screen rotatio
 
 ## Apps Using This Library
 
-If you would like for your app to be featured here, [contact me](cezarywojcik.com/contact) and I would love to hear about your app!
+If you would like for your app to be featured here, [contact me](http://cezarywojcik.com/contact) and I would love to hear about your app!
 
-* [SlideShare Presentations](https://itunes.apple.com/app/id917418728)
-* [Pong Ping](https://itunes.apple.com/us/app/pong-ping-social-addictive/id822887888)
+* [SlideShare Presentations](https://itunes.apple.com/app/id917418728)
+* [Pong Ping](https://itunes.apple.com/us/app/pong-ping-social-addictive/id822887888)
 * [NextMovies](https://itunes.apple.com/us/app/nextmovies-smart-movie-recommendation/id680850329)
+* [Social Dummy](https://itunes.apple.com/gb/app/social-dummy-create-fake-social/id610088272)
 
 ## License
 
     The MIT License (MIT)
 
-    Copyright (c) 2014 Cezary Wojcik <http://www.cezarywojcik.com>
+    Copyright (c) 2015 Cezary Wojcik <http://www.cezarywojcik.com>
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"), to deal