2.3.4

2.3.3
actually fixed conflict
2016-01-07 23:57:28 -08:00 · 2015-08-27 09:54:57 -07:00 · 2015-08-25 12:36:24 -07:00 · 2015-08-25 12:34:49 -07:00 · 2015-08-25 12:32:49 -07:00 · 2015-08-08 18:45:36 -07:00
17 changed files with 924 additions and 166 deletions
@@ -0,0 +1 @@
+language: objective-c
@@ -7,6 +7,7 @@
 	objects = {

 /* Begin PBXBuildFile section */
+		370883CE19F08756000E79D6 /* CustomView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 370883CD19F08756000E79D6 /* CustomView.xib */; };
 		5E0D045E1838AE0D00CBFC35 /* CWStatusBarNotification.m in Sources */ = {isa = PBXBuildFile; fileRef = 5E0D045D1838AE0D00CBFC35 /* CWStatusBarNotification.m */; };
 		5E2FFB5718367C01003333F8 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E2FFB5618367C01003333F8 /* Foundation.framework */; };
 		5E2FFB5918367C01003333F8 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E2FFB5818367C01003333F8 /* CoreGraphics.framework */; };
@@ -20,6 +21,7 @@
 		5E2FFB7218367C01003333F8 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E2FFB5A18367C01003333F8 /* UIKit.framework */; };
 		5E2FFB8E18367CA3003333F8 /* MainViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5E2FFB8C18367CA3003333F8 /* MainViewController.m */; };
 		5E2FFB8F18367CA3003333F8 /* MainViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5E2FFB8D18367CA3003333F8 /* MainViewController.xib */; };
+		5E7E40DA19C0F9CF00A0E3E0 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5E7E40D919C0F9CF00A0E3E0 /* LaunchScreen.xib */; };
 /* End PBXBuildFile section */

 /* Begin PBXContainerItemProxy section */
@@ -33,6 +35,7 @@
 /* End PBXContainerItemProxy section */

 /* Begin PBXFileReference section */
+		370883CD19F08756000E79D6 /* CustomView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CustomView.xib; sourceTree = "<group>"; };
 		5E0D045C1838AE0D00CBFC35 /* CWStatusBarNotification.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CWStatusBarNotification.h; path = CWStatusBarNotification/CWStatusBarNotification.h; sourceTree = SOURCE_ROOT; };
 		5E0D045D1838AE0D00CBFC35 /* CWStatusBarNotification.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CWStatusBarNotification.m; path = CWStatusBarNotification/CWStatusBarNotification.m; sourceTree = SOURCE_ROOT; };
 		5E2FFB5318367C01003333F8 /* CWNotificationDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CWNotificationDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -51,6 +54,7 @@
 		5E2FFB8B18367CA3003333F8 /* MainViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MainViewController.h; sourceTree = "<group>"; };
 		5E2FFB8C18367CA3003333F8 /* MainViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MainViewController.m; sourceTree = "<group>"; };
 		5E2FFB8D18367CA3003333F8 /* MainViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MainViewController.xib; sourceTree = "<group>"; };
+		5E7E40D919C0F9CF00A0E3E0 /* LaunchScreen.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = LaunchScreen.xib; sourceTree = "<group>"; };
 /* End PBXFileReference section */

 /* Begin PBXFrameworksBuildPhase section */
@@ -112,6 +116,7 @@
 			children = (
 				5E2FFB6518367C01003333F8 /* AppDelegate.h */,
 				5E2FFB6618367C01003333F8 /* AppDelegate.m */,
+				370883CD19F08756000E79D6 /* CustomView.xib */,
 				5E2FFB8918367C75003333F8 /* View Controllers */,
 				5E2FFB6818367C01003333F8 /* Images.xcassets */,
 				5E2FFB5D18367C01003333F8 /* Supporting Files */,
@@ -122,6 +127,7 @@
 		5E2FFB5D18367C01003333F8 /* Supporting Files */ = {
 			isa = PBXGroup;
 			children = (
+				5E7E40D919C0F9CF00A0E3E0 /* LaunchScreen.xib */,
 				5E2FFB5E18367C01003333F8 /* CWNotificationDemo-Info.plist */,
 				5E2FFB5F18367C01003333F8 /* InfoPlist.strings */,
 				5E2FFB6218367C01003333F8 /* main.m */,
@@ -202,7 +208,7 @@
 		5E2FFB4B18367C01003333F8 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0500;
+				LastUpgradeCheck = 0510;
 				ORGANIZATIONNAME = "Cezary Wojcik";
 				TargetAttributes = {
 					5E2FFB5218367C01003333F8 = {
@@ -236,6 +242,8 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				5E7E40DA19C0F9CF00A0E3E0 /* LaunchScreen.xib in Resources */,
+				370883CE19F08756000E79D6 /* CustomView.xib in Resources */,
 				5E2FFB6118367C01003333F8 /* InfoPlist.strings in Resources */,
 				5E2FFB8F18367CA3003333F8 /* MainViewController.xib in Resources */,
 				5E2FFB6918367C01003333F8 /* Images.xcassets in Resources */,
@@ -296,7 +304,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -304,6 +311,7 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
@@ -336,7 +344,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -344,6 +351,7 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
@@ -376,8 +384,10 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "CWNotificationDemo/CWNotificationDemo-Prefix.pch";
 				INFOPLIST_FILE = "CWNotificationDemo/CWNotificationDemo-Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
+				TARGETED_DEVICE_FAMILY = "1,2";
 				WRAPPER_EXTENSION = app;
 			};
 			name = Debug;
@@ -392,8 +402,10 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "CWNotificationDemo/CWNotificationDemo-Prefix.pch";
 				INFOPLIST_FILE = "CWNotificationDemo/CWNotificationDemo-Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
+				TARGETED_DEVICE_FAMILY = "1,2";
 				WRAPPER_EXTENSION = app;
 			};
 			name = Release;
@@ -401,7 +413,6 @@
 		5E2FFB8318367C01003333F8 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
 				BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/CWNotificationDemo.app/CWNotificationDemo";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(SDKROOT)/Developer/Library/Frameworks",
@@ -424,7 +435,6 @@
 		5E2FFB8418367C01003333F8 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
 				BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/CWNotificationDemo.app/CWNotificationDemo";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(SDKROOT)/Developer/Library/Frameworks",
@@ -24,6 +24,8 @@
 	<string>1.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>armv7</string>
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6245" systemVersion="13F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6238"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view contentMode="scaleToFill" id="iN0-l3-epB">
+            <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" animating="YES" style="white" translatesAutoresizingMaskIntoConstraints="NO" id="r93-cW-Ts4">
+                    <rect key="frame" x="10" y="291" width="20" height="20"/>
+                </activityIndicatorView>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="This is a custom view" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="z9l-SY-8er">
+                    <rect key="frame" x="218" y="290" width="165" height="21"/>
+                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                    <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                    <nil key="highlightedColor"/>
+                </label>
+            </subviews>
+            <color key="backgroundColor" red="0.098039224743843079" green="0.58039218187332153" blue="0.9803922176361084" alpha="1" colorSpace="deviceRGB"/>
+            <constraints>
+                <constraint firstAttribute="centerX" secondItem="z9l-SY-8er" secondAttribute="centerX" id="64P-Uw-ajT"/>
+                <constraint firstItem="r93-cW-Ts4" firstAttribute="centerY" secondItem="z9l-SY-8er" secondAttribute="centerY" id="Qc1-1z-FyY"/>
+                <constraint firstItem="r93-cW-Ts4" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="10" id="R3u-Kd-l55"/>
+                <constraint firstAttribute="centerY" secondItem="z9l-SY-8er" secondAttribute="centerY" id="pzf-Hi-YQD"/>
+            </constraints>
+        </view>
+    </objects>
+</document>
@@ -15,6 +15,11 @@
      "size" : "60x60",
      "scale" : "2x"
    },
+    {
+      "idiom" : "iphone",
+      "size" : "60x60",
+      "scale" : "3x"
+    },
    {
      "idiom" : "ipad",
      "size" : "29x29",
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6250" systemVersion="14A388a" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6244"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view contentMode="scaleToFill" id="iN0-l3-epB">
+            <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="CWStatusBarNotification" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PyY-2A-t44">
+                    <rect key="frame" x="204.5" y="289" width="192.5" height="21.5"/>
+                    <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="18"/>
+                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                    <nil key="highlightedColor"/>
+                </label>
+            </subviews>
+            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+            <constraints>
+                <constraint firstAttribute="centerY" secondItem="PyY-2A-t44" secondAttribute="centerY" constant="0.5" id="SYW-09-Sb1"/>
+                <constraint firstAttribute="centerX" secondItem="PyY-2A-t44" secondAttribute="centerX" id="xfo-fo-hOg"/>
+            </constraints>
+        </view>
+    </objects>
+</document>
@@ -16,10 +16,12 @@
@property (weak, nonatomic) IBOutlet UITextField *txtNotificationMessage;
@property (weak, nonatomic) IBOutlet UISegmentedControl *segFromStyle;
@property (weak, nonatomic) IBOutlet UISegmentedControl *segToStyle;
+@property (weak, nonatomic) IBOutlet UISegmentedControl *notificationStyle;

@property (strong, nonatomic) CWStatusBarNotification *notification;

 - (IBAction)sliderDurationChanged:(UISlider *)sender;
 - (IBAction)btnShowNotificationPressed:(UIButton *)sender;
+- (IBAction)btnShowCustomNotificationPressed:(UIButton *)sender;

@end
@@ -36,8 +36,12 @@
    NSDictionary *attributes = [NSDictionary dictionaryWithObject:font forKey:NSFontAttributeName];
    [self.segFromStyle setTitleTextAttributes:attributes forState:UIControlStateNormal];
    [self.segToStyle setTitleTextAttributes:attributes forState:UIControlStateNormal];
+    
    // initialize CWNotification
    self.notification = [CWStatusBarNotification new];
+    
+    // set default blue color (since iOS 7.1, default window tintColor is black)
+    self.notification.notificationLabelBackgroundColor = [UIColor colorWithRed:0.0 green:122.0/255.0 blue:1.0 alpha:1.0];
 }

 - (void)didReceiveMemoryWarning
@@ -58,11 +62,24 @@

 # pragma mark - show notification

- (IBAction)btnShowNotificationPressed:(UIButton *)sender
+- (void)setupNotification
 {
    self.notification.notificationAnimationInStyle = self.segFromStyle.selectedSegmentIndex;
    self.notification.notificationAnimationOutStyle = self.segToStyle.selectedSegmentIndex;
+    self.notification.notificationStyle = self.notificationStyle.selectedSegmentIndex == 0 ?
+    CWNotificationStyleStatusBarNotification : CWNotificationStyleNavigationBarNotification;
+}
+
+- (IBAction)btnShowNotificationPressed:(UIButton *)sender
+{
+    [self setupNotification];
    [self.notification displayNotificationWithMessage:self.txtNotificationMessage.text forDuration:self.sliderDuration.value];
 }

+- (IBAction)btnShowCustomNotificationPressed:(UIButton *)sender {
+    [self setupNotification];
+    UIView *view = [[NSBundle mainBundle] loadNibNamed:@"CustomView" owner:nil options:nil][0];
+    [self.notification displayNotificationWithView:view forDuration:self.sliderDuration.value];
+}
+
@end
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="4514" systemVersion="13A3017" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6250" systemVersion="14A388a" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES">
    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3747"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6244"/>
    </dependencies>
    <objects>
        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MainViewController">
            <connections>
                <outlet property="lblDuration" destination="oAK-DR-B27" id="roa-nx-2td"/>
+                <outlet property="notificationStyle" destination="fcn-wc-llO" id="6cr-5b-6JN"/>
                <outlet property="segFromStyle" destination="vWx-wx-d32" id="Zvu-PE-8D7"/>
                <outlet property="segToStyle" destination="Bza-7R-910" id="CkD-Lr-RCl"/>
                <outlet property="sliderDuration" destination="lnj-T4-sfz" id="BYx-MN-Cnz"/>
@@ -16,12 +17,11 @@
        </placeholder>
        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
        <view contentMode="scaleToFill" id="1">
-            <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+            <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
            <subviews>
                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="DId-6z-9ak">
-                    <rect key="frame" x="100" y="269" width="121" height="30"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                    <rect key="frame" x="147" y="293" width="121" height="30"/>
                    <state key="normal" title="Show Notification">
                        <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                    </state>
@@ -30,36 +30,28 @@
                    </connections>
                </button>
                <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" minValue="0.0" maxValue="10" translatesAutoresizingMaskIntoConstraints="NO" id="lnj-T4-sfz">
-                    <rect key="frame" x="18" y="159" width="284" height="34"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                    <rect key="frame" x="18" y="186" width="378" height="31"/>
                    <connections>
                        <action selector="sliderDurationChanged:" destination="-1" eventType="valueChanged" id="bHo-Bt-cG4"/>
                    </connections>
                </slider>
                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Duration: " lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nHX-St-Osi">
-                    <rect key="frame" x="20" y="200" width="75" height="21"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                    <constraints>
-                        <constraint firstAttribute="width" constant="75" id="Bek-Lg-K7h"/>
-                    </constraints>
+                    <rect key="frame" x="20" y="225" width="75" height="20.5"/>
                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
                    <nil key="highlightedColor"/>
                </label>
                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oAK-DR-B27">
-                    <rect key="frame" x="103" y="200" width="197" height="21"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                    <rect key="frame" x="103" y="225" width="291" height="20.5"/>
                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
                    <nil key="highlightedColor"/>
                </label>
                <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Notification Message" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="VqG-wR-oYI">
-                    <rect key="frame" x="20" y="229" width="280" height="30"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                    <rect key="frame" x="20" y="253" width="374" height="30"/>
                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
                    <textInputTraits key="textInputTraits"/>
                </textField>
                <segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="Bza-7R-910">
-                    <rect key="frame" x="20" y="123" width="280" height="29"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                    <rect key="frame" x="20" y="114" width="374" height="29"/>
                    <segments>
                        <segment title="To Top"/>
                        <segment title="To Bottom"/>
@@ -68,8 +60,7 @@
                    </segments>
                </segmentedControl>
                <segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="vWx-wx-d32">
-                    <rect key="frame" x="20" y="87" width="280" height="29"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                    <rect key="frame" x="20" y="78" width="374" height="29"/>
                    <segments>
                        <segment title="From Top"/>
                        <segment title="From Bottom"/>
@@ -77,31 +68,59 @@
                        <segment title="From Right"/>
                    </segments>
                </segmentedControl>
+                <segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="fcn-wc-llO">
+                    <rect key="frame" x="20" y="150" width="374" height="29"/>
+                    <segments>
+                        <segment title="Status Bar"/>
+                        <segment title="Navigation Bar"/>
+                    </segments>
+                </segmentedControl>
+                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="E8G-aN-rjr">
+                    <rect key="frame" x="99" y="331" width="216" height="30"/>
+                    <state key="normal" title="Show Custom View Notification">
+                        <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                    </state>
+                    <connections>
+                        <action selector="btnShowCustomNotificationPressed:" destination="-1" eventType="touchUpInside" id="LIQ-4P-I0D"/>
+                        <action selector="btnShowNotificationPressed:" destination="-1" eventType="touchUpInside" id="jNW-Ie-NPn"/>
+                    </connections>
+                </button>
            </subviews>
            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
            <constraints>
-                <constraint firstItem="nHX-St-Osi" firstAttribute="leading" secondItem="1" secondAttribute="leading" constant="20" id="4tg-Qw-ILZ"/>
-                <constraint firstItem="lnj-T4-sfz" firstAttribute="top" secondItem="Bza-7R-910" secondAttribute="bottom" constant="8" id="6cG-SS-RNU"/>
-                <constraint firstItem="VqG-wR-oYI" firstAttribute="top" secondItem="nHX-St-Osi" secondAttribute="bottom" constant="8" id="9hr-jC-jbb"/>
-                <constraint firstAttribute="centerX" secondItem="DId-6z-9ak" secondAttribute="centerX" constant="-0.5" id="ECT-G3-ltp"/>
-                <constraint firstItem="VqG-wR-oYI" firstAttribute="top" secondItem="lnj-T4-sfz" secondAttribute="bottom" constant="37" id="Iej-w9-X3g"/>
-                <constraint firstItem="VqG-wR-oYI" firstAttribute="top" secondItem="oAK-DR-B27" secondAttribute="bottom" constant="8" id="PaN-1y-iK6"/>
-                <constraint firstAttribute="trailing" secondItem="oAK-DR-B27" secondAttribute="trailing" constant="20" id="RHA-aR-sFs"/>
-                <constraint firstItem="Bza-7R-910" firstAttribute="top" secondItem="vWx-wx-d32" secondAttribute="bottom" constant="8" id="Th2-HC-3XF"/>
-                <constraint firstItem="lnj-T4-sfz" firstAttribute="leading" secondItem="1" secondAttribute="leading" constant="20" id="WB4-6Z-Na6"/>
-                <constraint firstItem="DId-6z-9ak" firstAttribute="top" secondItem="VqG-wR-oYI" secondAttribute="bottom" constant="10" id="WNV-wr-Bat"/>
-                <constraint firstAttribute="trailing" secondItem="Bza-7R-910" secondAttribute="trailing" constant="20" id="h9H-xz-Gmn"/>
-                <constraint firstItem="vWx-wx-d32" firstAttribute="leading" secondItem="1" secondAttribute="leading" constant="20" id="iK5-oo-S2I"/>
-                <constraint firstAttribute="trailing" secondItem="lnj-T4-sfz" secondAttribute="trailing" constant="20" id="mKo-JE-12D"/>
-                <constraint firstItem="VqG-wR-oYI" firstAttribute="leading" secondItem="1" secondAttribute="leading" constant="20" id="rSQ-BG-N1Y"/>
-                <constraint firstItem="oAK-DR-B27" firstAttribute="leading" secondItem="nHX-St-Osi" secondAttribute="trailing" constant="8" id="s0T-uS-rNG"/>
-                <constraint firstItem="Bza-7R-910" firstAttribute="leading" secondItem="1" secondAttribute="leading" constant="20" id="tZA-D2-wfU"/>
-                <constraint firstAttribute="trailing" secondItem="vWx-wx-d32" secondAttribute="trailing" constant="20" id="wbE-dB-geM"/>
-                <constraint firstAttribute="trailing" secondItem="VqG-wR-oYI" secondAttribute="trailing" constant="20" id="wx3-Mc-klx"/>
-                <constraint firstAttribute="centerY" secondItem="DId-6z-9ak" secondAttribute="centerY" id="ynw-tb-3sz"/>
+                <constraint firstItem="vWx-wx-d32" firstAttribute="top" secondItem="1" secondAttribute="top" constant="78" id="1oB-rT-mPo"/>
+                <constraint firstAttribute="centerX" secondItem="fcn-wc-llO" secondAttribute="centerX" id="2Vh-Y9-bR5"/>
+                <constraint firstItem="oAK-DR-B27" firstAttribute="top" secondItem="lnj-T4-sfz" secondAttribute="bottom" constant="9" id="6zC-Vn-47H"/>
+                <constraint firstAttribute="centerX" secondItem="E8G-aN-rjr" secondAttribute="centerX" id="9d1-PR-JUW"/>
+                <constraint firstItem="fcn-wc-llO" firstAttribute="top" secondItem="Bza-7R-910" secondAttribute="bottom" constant="8" id="CXZ-Xq-PaS"/>
+                <constraint firstAttribute="centerX" secondItem="VqG-wR-oYI" secondAttribute="centerX" id="EZF-ae-sk0"/>
+                <constraint firstItem="DId-6z-9ak" firstAttribute="top" secondItem="VqG-wR-oYI" secondAttribute="bottom" constant="10" id="Koz-Hg-zs6"/>
+                <constraint firstItem="oAK-DR-B27" firstAttribute="leading" secondItem="nHX-St-Osi" secondAttribute="trailing" constant="8" id="Rv3-LK-x94"/>
+                <constraint firstItem="vWx-wx-d32" firstAttribute="width" secondItem="Bza-7R-910" secondAttribute="width" id="TLh-rn-5OJ"/>
+                <constraint firstItem="VqG-wR-oYI" firstAttribute="width" secondItem="fcn-wc-llO" secondAttribute="width" id="VN0-NS-cxS"/>
+                <constraint firstItem="fcn-wc-llO" firstAttribute="width" secondItem="lnj-T4-sfz" secondAttribute="width" id="VaZ-W0-jE9"/>
+                <constraint firstItem="nHX-St-Osi" firstAttribute="leading" secondItem="1" secondAttribute="leading" constant="20" id="am1-tr-889"/>
+                <constraint firstItem="fcn-wc-llO" firstAttribute="width" secondItem="Bza-7R-910" secondAttribute="width" id="e4t-sE-dFP"/>
+                <constraint firstAttribute="centerX" secondItem="DId-6z-9ak" secondAttribute="centerX" constant="-0.5" id="eaF-Ou-aly"/>
+                <constraint firstAttribute="trailing" secondItem="vWx-wx-d32" secondAttribute="trailing" constant="20" id="fax-Hs-B09"/>
+                <constraint firstItem="fcn-wc-llO" firstAttribute="width" secondItem="oAK-DR-B27" secondAttribute="width" constant="83" id="gJx-JQ-AKj"/>
+                <constraint firstItem="Bza-7R-910" firstAttribute="top" secondItem="vWx-wx-d32" secondAttribute="bottom" constant="8" id="iKn-wI-ama"/>
+                <constraint firstAttribute="centerX" secondItem="lnj-T4-sfz" secondAttribute="centerX" id="mud-VX-xYt"/>
+                <constraint firstItem="nHX-St-Osi" firstAttribute="top" secondItem="lnj-T4-sfz" secondAttribute="bottom" constant="9" id="oWk-lv-8CY"/>
+                <constraint firstItem="VqG-wR-oYI" firstAttribute="top" secondItem="nHX-St-Osi" secondAttribute="bottom" constant="7.5" id="pMI-GA-jIb"/>
+                <constraint firstItem="vWx-wx-d32" firstAttribute="leading" secondItem="1" secondAttribute="leading" constant="20" id="qul-l9-Wcv"/>
+                <constraint firstItem="lnj-T4-sfz" firstAttribute="top" secondItem="fcn-wc-llO" secondAttribute="bottom" constant="8" id="rcX-0a-RzU"/>
+                <constraint firstAttribute="centerX" secondItem="Bza-7R-910" secondAttribute="centerX" id="wU3-cB-7dO"/>
+                <constraint firstItem="E8G-aN-rjr" firstAttribute="top" secondItem="DId-6z-9ak" secondAttribute="bottom" constant="8" id="xGQ-39-pOh"/>
+                <constraint firstAttribute="centerX" secondItem="vWx-wx-d32" secondAttribute="centerX" id="z6v-r5-zad"/>
            </constraints>
-            <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/>
-            <simulatedScreenMetrics key="simulatedDestinationMetrics" type="retina4"/>
+            <simulatedNavigationBarMetrics key="simulatedTopBarMetrics" prompted="NO"/>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
        </view>
    </objects>
-</document>
+    <simulatedMetricsContainer key="defaultSimulatedMetrics">
+        <simulatedStatusBarMetrics key="statusBar"/>
+        <simulatedOrientationMetrics key="orientation"/>
+        <simulatedScreenMetrics key="destination" type="retina4"/>
+    </simulatedMetricsContainer>
+</document>
@@ -1,9 +1,9 @@
 Pod::Spec.new do |s|
  s.name         = "CWStatusBarNotification"
-  s.version      = "2.0.0"
+  s.version      = "2.3.4"
  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     = "http://github.com/cezarywojcik/CWStatusBarNotification"
+  s.homepage     = "https://github.com/cezarywojcik/CWStatusBarNotification"
  s.screenshots  = "https://raw.github.com/cezarywojcik/CWStatusBarNotification/master/screenshots/screenshot.png"
  s.license      = { :type => 'MIT', :file => 'LICENSE' }
  s.author       = { "Cezary Wojcik" => "me@cezarywojcik.com" }
@@ -3,38 +3,270 @@
 //  CWNotificationDemo
 //
 //  Created by Cezary Wojcik on 11/15/13.
-//  Copyright (c) 2013 Cezary Wojcik. All rights reserved.
+//  Copyright (c) 2015 Cezary Wojcik. All rights reserved.
 //

-#import <Foundation/Foundation.h>
+/**
+ * @brief A simple completion used for handling tapping the notification.
+ */
+typedef void(^CWCompletionBlock)(void);

+# pragma mark - ScrollLabel
+
+/**
+ * A subclass of @c UILabel that scrolls the text if it is too long for the 
+ * label.
+ */
+@interface ScrollLabel : UILabel
+/**
+ * Used to find the amount of time that the label will spend scrolling.
+ * @return The amount of time that will be spent scrolling.
+ */
+- (CGFloat)scrollTime;
+@end
+
+# pragma mark - CWWindowContainer
+
+/**
+ * A subclass of @c UIWindow that overrides the @c hitTest method in order to 
+ * allow tap events to pass through the window.
+ */
+@interface CWWindowContainer : UIWindow
+/// The height of the notification that is being displayed in the window.
+@property (assign, nonatomic) CGFloat notificationHeight;
+@end
+
+# pragma mark - CWViewController
+
+/**
+ * A subclass of @c UIViewController that allows handing over
+ * @c supportedInterfaceOrientations if needed.
+ */
+@interface CWViewController : UIViewController
+/// Indicates the preferred status bar style.
+@property (nonatomic) UIStatusBarStyle preferredStatusBarStyle;
+/// Indicats the supported interface orientations.
+@property (nonatomic, setter=setSupportedInterfaceOrientations:)
+    UIInterfaceOrientationMask supportedInterfaceOrientations;
+@end
+
+# pragma mark - CWStatusBarNotification
+
+/**
+ * A subclass of @c NSObject that is responsible for managing status bar
+ * notifications.
+ */
@interface CWStatusBarNotification : NSObject

-enum {
+# pragma mark - enums
+
+/**
+ * @typedef CWNotificationStyle
+ * @brief Determines the notification style.
+ */
+typedef NS_ENUM(NSInteger, CWNotificationStyle) {
+    /// Covers the status bar portion of the screen.
    CWNotificationStyleStatusBarNotification,
+    /// Covers the status bar and navigation bar portions of the screen.
    CWNotificationStyleNavigationBarNotification
 };

-enum {
+/**
+ * @typedef CWNotificationAnimationStyle
+ * @brief Determines the direction of animation for the notification.
+ */
+typedef NS_ENUM(NSInteger, CWNotificationAnimationStyle) {
+    /// Animate in from the top or animate out to the top.
    CWNotificationAnimationStyleTop,
+    /// Animate in from the bottom or animate out to the bottom.
    CWNotificationAnimationStyleBottom,
+    /// Animate in from the left or animate out to the left.
    CWNotificationAnimationStyleLeft,
+    /// Animate in from the right or animate out to the right.
    CWNotificationAnimationStyleRight
 };

-@property (strong, nonatomic) UILabel *notificationLabel;
-@property (strong, nonatomic) UIColor *notificationLabelBackgroundColor;
-@property (strong, nonatomic) UIColor *notificationLabelTextColor;
+/**
+ * @typedef CWNotificationAnimationType
+ * @brief Determines whether the notification moves the existing content out of
+ * the way or simply overlays it.
+ */
+typedef NS_ENUM(NSInteger, CWNotificationAnimationType) {
+    /// Moves existing content out of the way.
+    CWNotificationAnimationTypeReplace,
+    /// Overlays existing content.
+    CWNotificationAnimationTypeOverlay
+};

+# pragma mark - properties
+
+/// The label that holds the notification text.
+@property (strong, nonatomic) ScrollLabel *notificationLabel;
+/// The @c UIView that holds a screenshot of the status bar view.
@property (strong, nonatomic) UIView *statusBarView;
-
-@property (nonatomic) NSInteger notificationStyle;
-@property (nonatomic) NSInteger notificationAnimationInStyle;
-@property (nonatomic) NSInteger notificationAnimationOutStyle;
+/// The block that gets triggered when the notification is tapped.
+@property (copy, nonatomic) CWCompletionBlock notificationTappedBlock;
+/// Indicates whether the notification is currently being shown.
@property (nonatomic) BOOL notificationIsShowing;
+/// Indicates whether the notification is currently dismissing.
+@property (nonatomic) BOOL notificationIsDismissing;
+/// The window that holds the notification.
+@property (strong, nonatomic) CWWindowContainer *notificationWindow;

-@property (strong, nonatomic) UIWindow *notificationWindow;
+/**
+ * The background color of the notification label. Default value is the tint
+ * color of the application's main window.
+ */
+@property (strong, nonatomic) UIColor *notificationLabelBackgroundColor;
+/**
+ * The text color of the notification label. Default value is white.
+ */
+@property (strong, nonatomic) UIColor *notificationLabelTextColor;
+/**
+ * The font of the notification label. Default value is system font.
+ */
+@property (strong, nonatomic) UIFont *notificationLabelFont;
+/**
+ * Allows setting a custom height for the notification label. If this value is
+ * 0, the height will be determined by the @c notificationStyle. Default value
+ * is 0.
+ */
+@property (assign, nonatomic) CGFloat notificationLabelHeight;
+/**
+ * The custom view to present if using @c displayNotificationWithView. Default
+ * value is @c nil.
+ */
+@property (strong, nonatomic) UIView *customView;
+/**
+ * Determines whether the notification text has multiple lines. Default value is
+ * @c NO.
+ */
+@property (assign, nonatomic) BOOL multiline;
+/**
+ * The supported interface orientations. Default value is the
+ * @c supportedInterfaceOrientations value of the root view controller of the
+ * application.
+ */
+@property (nonatomic) UIInterfaceOrientationMask supportedInterfaceOrientations;
+/**
+ * The amount of time that it takes to animate the notification in or out.
+ * Default value is 0.25.
+ */
+@property (nonatomic) NSTimeInterval notificationAnimationDuration;
+/**
+ * Determines whether the notification covers the status bar or both the status
+ * bar and the navigation bar. Default value is 
+ * @c CWNotificationStyleStatusBarNotification.
+ */
+@property (nonatomic) CWNotificationStyle notificationStyle;
+/**
+ * Determines the direction from which the notification animates in. Default
+ * value is @c CWNotificationAnimationStyleBottom.
+ */
+@property (nonatomic) CWNotificationAnimationStyle notificationAnimationInStyle;
+/**
+ * Determines the direction from which the notification animates out. Default
+ * value is @c CWNotificationAnimationStyleBottom.
+ */
+@property (nonatomic) CWNotificationAnimationStyle
+    notificationAnimationOutStyle;
+/**
+ * Determines whether the the notification's animation replaces the existing 
+ * content or overlays it. Default value is 
+ * @c CWNotificationAnimationTypeReplace.
+ */
+@property (nonatomic) CWNotificationAnimationType notificationAnimationType;
+/**
+ * The preferred status bar style. Default value is @c UIStatusBarStyleDefault.
+ */
+@property (nonatomic) UIStatusBarStyle preferredStatusBarStyle;

- (void)displayNotificationWithMessage:(NSString *)message forDuration:(CGFloat)duration;
+#pragma mark - methods
+
+/**
+ * Displays a notification with the indicated message and then performs the
+ * completion block once the notification animates in.
+ * @param message
+ *        The content of the message to be displayed.
+ * @param completion
+ *        The block to be invoked once the notification is displayed.
+ */
+- (void)displayNotificationWithMessage:(NSString *)message
+                            completion:(void (^)(void))completion;
+
+/**
+ * Displays a notification with the indicated message for the indicated
+ * duration.
+ * @param message
+ *        The content of the message to be displayed.
+ * @param duration
+ *        The amount of seconds for which the notification should be displayed,
+ *        not including the animate in and out times.
+ */
+- (void)displayNotificationWithMessage:(NSString *)message
+                           forDuration:(NSTimeInterval)duration;
+
+/**
+ * Displays a notification with the indicated attributed string and then 
+ * performs the completion block once the notification animates in.
+ * @param attributedString
+ *        The content of the message to be displayed.
+ * @param completion
+ *        The block to be invoked once the notification is displayed.
+ */
+- (void)displayNotificationWithAttributedString:(NSAttributedString *)
+                                                attributedString
+                                     completion:(void (^)(void))completion;
+
+/**
+ * Displays a notification with the indicated message for the indicated
+ * duration.
+ * @param attributedString
+ *        The content of the message to be displayed.
+ * @param duration
+ *        The amount of seconds for which the notification should be displayed,
+ *        not including the animate in and out times.
+ */
+- (void)displayNotificationWithAttributedString:(NSAttributedString *)
+                                                attributedString
+                                    forDuration:(NSTimeInterval)duration;
+
+/**
+ * Displays a notification with the indicated custom view and then performs the
+ * completion block once the notification animates in.
+ * @param view
+ *        The custom @c UIView that you wish to present.
+ * @param completion
+ *        The block to be invoked once the notification is displayed.
+ */
+
+- (void)displayNotificationWithView:(UIView *)view
+                         completion:(void (^)(void))completion;
+
+/**
+ * Displays a notification with the indicated custom view for the indicated
+ * duration.
+ * @param view
+ *        The custom @c UIView that you wish to present.
+ * @param duration
+ *        The amount of seconds for which the notification should be displayed,
+ *        not including the animate in and out times.
+ */
+- (void)displayNotificationWithView:(UIView *)view
+                        forDuration:(NSTimeInterval)duration;
+
+/**
+ * Dismisses the currently presented notification and then performs the
+ * completion block.
+ * @param completion
+ *        The block to be invoked after the notification is dismissed.
+ */
+- (void)dismissNotificationWithCompletion:(void(^)(void))completion;
+
+/**
+ * Dismisses the currently presented notification.
+ */
+
+- (void)dismissNotification;

@end
@@ -3,83 +3,273 @@
 //  CWNotificationDemo
 //
 //  Created by Cezary Wojcik on 11/15/13.
-//  Copyright (c) 2013 Cezary Wojcik. All rights reserved.
+//  Copyright (c) 2015 Cezary Wojcik. All rights reserved.
 //

 #import <QuartzCore/QuartzCore.h>
-
 #import "CWStatusBarNotification.h"

-#define STATUS_BAR_ANIMATION_LENGTH 0.25f
+#define SYSTEM_VERSION_LESS_THAN(v) ([[[UIDevice currentDevice] systemVersion] compare:v options:NSNumericSearch] == NSOrderedAscending)
+
 #define FONT_SIZE 12.0f
+#define PADDING 10.0f
+#define SCROLL_SPEED 40.0f
+#define SCROLL_DELAY 1.0f
+
+# pragma mark - ScrollLabel
+
+@implementation ScrollLabel
+{
+    UIImageView *textImage;
+}
+
+- (id)initWithFrame:(CGRect)frame
+{
+    self = [super initWithFrame:frame];
+    if (self) {
+        textImage = [[UIImageView alloc] init];
+        [self addSubview:textImage];
+    }
+    return self;
+}
+
+- (CGFloat)fullWidth
+{
+    return [self.text sizeWithAttributes:@{NSFontAttributeName: self.font}].width;
+}
+
+- (CGFloat)scrollOffset
+{
+    if (self.numberOfLines != 1) return 0;
+    
+    CGRect insetRect = CGRectInset(self.bounds, PADDING, 0);
+    return MAX(0, [self fullWidth] - insetRect.size.width);
+}
+
+- (CGFloat)scrollTime
+{
+    return ([self scrollOffset] > 0) ? [self scrollOffset] / SCROLL_SPEED + SCROLL_DELAY : 0;
+}
+
+- (void)drawTextInRect:(CGRect)rect
+{
+    if ([self scrollOffset] > 0) {
+        rect.size.width = [self fullWidth] + PADDING * 2;
+        UIGraphicsBeginImageContextWithOptions(rect.size, NO, [UIScreen mainScreen].scale);
+        [super drawTextInRect:rect];
+        textImage.image = UIGraphicsGetImageFromCurrentImageContext();
+        UIGraphicsEndImageContext();
+        [textImage sizeToFit];
+        [UIView animateWithDuration:[self scrollTime] - SCROLL_DELAY
+                              delay:SCROLL_DELAY
+                            options:UIViewAnimationOptionBeginFromCurrentState | UIViewAnimationOptionCurveEaseInOut
+                         animations:^{
+                             textImage.transform = CGAffineTransformMakeTranslation(-[self scrollOffset], 0);
+                         } completion:^(BOOL finished) {
+                         }];
+    } else {
+        textImage.image = nil;
+        [super drawTextInRect:CGRectInset(rect, PADDING, 0)];
+    }
+}
+
+@end
+
+# pragma mark - CWWindowContainer
+
+@implementation CWWindowContainer
+
+- (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event
+{
+    CGFloat height;
+    if (SYSTEM_VERSION_LESS_THAN(@"8.0") && UIInterfaceOrientationIsLandscape([UIApplication sharedApplication].statusBarOrientation)) {
+        height = [UIApplication sharedApplication].statusBarFrame.size.width;
+    } else {
+        height = [UIApplication sharedApplication].statusBarFrame.size.height;
+    }
+    if (point.y > 0 && point.y < (self.notificationHeight != 0.0 ? self.notificationHeight : height)) {
+        return [super hitTest:point withEvent:event];
+    }
+
+    return nil;
+}
+
+@end
+
+# pragma mark - CWViewController
+
+@interface CWViewController()
+
+@property (nonatomic, assign) NSInteger _cwViewControllerSupportedInterfaceOrientation;
+
+@end
+
+@implementation CWViewController
+
+- (UIStatusBarStyle)preferredStatusBarStyle
+{
+    return _preferredStatusBarStyle;
+}
+
+- (void)setSupportedInterfaceOrientations:(UIInterfaceOrientationMask)supportedInterfaceOrientations
+{
+    self._cwViewControllerSupportedInterfaceOrientation = supportedInterfaceOrientations;
+}
+
+- (UIInterfaceOrientationMask)supportedInterfaceOrientations
+{
+    return self._cwViewControllerSupportedInterfaceOrientation;
+}
+
+- (BOOL)prefersStatusBarHidden
+{
+    CGFloat statusBarHeight = [[UIApplication sharedApplication] statusBarFrame].size.height;
+    return !(statusBarHeight > 0);
+}
+
+@end
+
+# pragma mark - dispatch after with cancellation
+// adapted from: https://github.com/Spaceman-Labs/Dispatch-Cancel
+
+typedef void(^CWDelayedBlockHandle)(BOOL cancel);
+
+static CWDelayedBlockHandle perform_block_after_delay(CGFloat seconds, dispatch_block_t block)
+{
+	if (block == nil) {
+		return nil;
+	}
+
+	__block dispatch_block_t blockToExecute = [block copy];
+	__block CWDelayedBlockHandle delayHandleCopy = nil;
+
+	CWDelayedBlockHandle delayHandle = ^(BOOL cancel){
+		if (NO == cancel && nil != blockToExecute) {
+			dispatch_async(dispatch_get_main_queue(), blockToExecute);
+		}
+
+		blockToExecute = nil;
+		delayHandleCopy = nil;
+	};
+
+	delayHandleCopy = [delayHandle copy];
+
+	dispatch_after(dispatch_time(DISPATCH_TIME_NOW, seconds * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
+		if (nil != delayHandleCopy) {
+			delayHandleCopy(NO);
+		}
+	});
+
+	return delayHandleCopy;
+};
+
+static void cancel_delayed_block(CWDelayedBlockHandle delayedHandle)
+{
+	if (delayedHandle == nil) {
+		return;
+	}
+
+	delayedHandle(YES);
+}
+# pragma mark - CWStatusBarNotification
+
+@interface CWStatusBarNotification()
+
+@property (strong, nonatomic) UITapGestureRecognizer *tapGestureRecognizer;
+@property (strong, nonatomic) CWDelayedBlockHandle dismissHandle;
+@property (assign, nonatomic) BOOL isCustomView;
+
+@end

@implementation CWStatusBarNotification

-@synthesize notificationLabel, notificationLabelBackgroundColor, notificationLabelTextColor, notificationWindow;
+@synthesize notificationLabel, notificationLabelBackgroundColor, notificationLabelTextColor, notificationLabelFont, notificationWindow, customView;

@synthesize statusBarView;

@synthesize notificationStyle, notificationIsShowing;

- (CWStatusBarNotification *)init {
+- (CWStatusBarNotification *)init
+{
    self = [super init];
    if (self) {
-        // set defaults
-        self.notificationLabelBackgroundColor = [[UIApplication sharedApplication] delegate].window.tintColor;
+        // set default
+        if ([[[UIApplication sharedApplication] delegate] respondsToSelector:@selector(window)]) {
+            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 = [UIApplication sharedApplication].keyWindow.rootViewController.supportedInterfaceOrientations;
+        self.notificationAnimationDuration = 0.25;
        self.notificationStyle = CWNotificationStyleStatusBarNotification;
        self.notificationAnimationInStyle = CWNotificationAnimationStyleBottom;
        self.notificationAnimationOutStyle = CWNotificationAnimationStyleBottom;
+        self.notificationAnimationType = CWNotificationAnimationTypeReplace;
+        self.notificationIsDismissing = NO;
+        self.isCustomView = NO;
+        self.preferredStatusBarStyle = UIStatusBarStyleDefault;
+
+        // create tap recognizer
+        self.tapGestureRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(notificationTapped:)];
+        self.tapGestureRecognizer.numberOfTapsRequired = 1;
+
+        // create default tap block
+        __weak typeof(self) weakSelf = self;
+        self.notificationTappedBlock = ^(void) {
+            if (!weakSelf.notificationIsDismissing) {
+                [weakSelf dismissNotification];
+            }
+        };
    }
    return self;
 }

 # pragma mark - dimensions

- (CGFloat)getStatusBarHeight {
+- (CGFloat)getStatusBarHeight
+{
+    if (self.notificationLabelHeight > 0) {
+        return self.notificationLabelHeight;
+    }
    CGFloat statusBarHeight = [[UIApplication sharedApplication] statusBarFrame].size.height;
-    if (UIDeviceOrientationIsLandscape([UIApplication sharedApplication].statusBarOrientation)) {
+    if (SYSTEM_VERSION_LESS_THAN(@"8.0") && UIInterfaceOrientationIsLandscape([UIApplication sharedApplication].statusBarOrientation)) {
        statusBarHeight = [[UIApplication sharedApplication] statusBarFrame].size.width;
    }
-    return statusBarHeight;
+    return statusBarHeight > 0 ? statusBarHeight : 20;
 }

- (CGFloat)getStatusBarWidth {
-    if (UIDeviceOrientationIsPortrait([UIApplication sharedApplication].statusBarOrientation)) {
-        return [UIScreen mainScreen].bounds.size.width;
+- (CGFloat)getStatusBarWidth
+{
+    if (SYSTEM_VERSION_LESS_THAN(@"8.0") && UIInterfaceOrientationIsLandscape([UIApplication sharedApplication].statusBarOrientation)) {
+        return [UIScreen mainScreen].bounds.size.height;
    }
-    return [UIScreen mainScreen].bounds.size.height;
+    return [[UIApplication sharedApplication] keyWindow].bounds.size.width;
 }

- (CGRect)getNotificationLabelTopFrame {
-    return CGRectMake(0, -1*[self getNotificationLabelHeight], [self getStatusBarWidth], [self getNotificationLabelHeight]);
+- (CGFloat)getStatusBarOffset
+{
+    if ([self getStatusBarHeight] == 40.0f) {
+        return -20.0f;
+    }
+    return 0.0f;
 }

- (CGRect)getNotificationLabelLeftFrame {
-    return CGRectMake(-1*[self getStatusBarWidth], 0, [self getStatusBarWidth], [self getNotificationLabelHeight]);
-}
-
- (CGRect)getNotificationLabelRightFrame {
-    return CGRectMake([self getStatusBarWidth], 0, [self getStatusBarWidth], [self getNotificationLabelHeight]);
-}
-
- (CGRect)getNotificationLabelBottomFrame {
-    return CGRectMake(0, [self getNotificationLabelHeight], [self getStatusBarWidth], 0);
-}
-
- (CGRect)getNotificationLabelFrame {
-    return CGRectMake(0, 0, [self getStatusBarWidth], [self getNotificationLabelHeight]);
-}
-
- (CGFloat)getNavigationBarHeight {
-    if (UIDeviceOrientationIsPortrait([UIApplication sharedApplication].statusBarOrientation) ||
+- (CGFloat)getNavigationBarHeight
+{
+    if (UIInterfaceOrientationIsPortrait([UIApplication sharedApplication].statusBarOrientation) ||
        UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
        return 44.0f;
    }
    return 30.0f;
 }

- (CGFloat)getNotificationLabelHeight {
+- (CGFloat)getNotificationLabelHeight
+{
    switch (self.notificationStyle) {
        case CWNotificationStyleStatusBarNotification:
            return [self getStatusBarHeight];
@@ -90,58 +280,122 @@
    }
 }

+- (CGRect)getNotificationLabelTopFrame
+{
+    return CGRectMake(0, [self getStatusBarOffset] + -1*[self getNotificationLabelHeight], [self getStatusBarWidth], [self getNotificationLabelHeight]);
+}
+
+- (CGRect)getNotificationLabelLeftFrame
+{
+    return CGRectMake(-1*[self getStatusBarWidth], [self getStatusBarOffset], [self getStatusBarWidth], [self getNotificationLabelHeight]);
+}
+
+- (CGRect)getNotificationLabelRightFrame
+{
+    return CGRectMake([self getStatusBarWidth], [self getStatusBarOffset], [self getStatusBarWidth], [self getNotificationLabelHeight]);
+}
+
+- (CGRect)getNotificationLabelBottomFrame
+{
+    return CGRectMake(0, [self getStatusBarOffset] + [self getNotificationLabelHeight], [self getStatusBarWidth], 0);
+}
+
+- (CGRect)getNotificationLabelFrame
+{
+    return CGRectMake(0, [self getStatusBarOffset], [self getStatusBarWidth], [self getNotificationLabelHeight]);
+}
+
 # pragma mark - screen orientation change

- (void)screenOrientationChanged {
-    self.notificationLabel.frame = [self getNotificationLabelFrame];
+- (void)updateStatusBarFrame
+{
+    UIView *view = self.isCustomView ? self.customView : self.notificationLabel;
+    view.frame = [self getNotificationLabelFrame];
    self.statusBarView.hidden = YES;
 }

+# pragma mark - on tap
+
+- (void)notificationTapped:(UITapGestureRecognizer*)recognizer
+{
+    [self.notificationTappedBlock invoke];
+}
+
 # pragma mark - display helpers

- (void)createNotificationLabelWithMessage:(NSString *)message
+- (void)setupNotificationView:(UIView *)view
 {
-    self.notificationLabel = [UILabel new];
-    self.notificationLabel.text = message;
-    self.notificationLabel.textAlignment = NSTextAlignmentCenter;
-    self.notificationLabel.adjustsFontSizeToFitWidth = YES;
-    self.notificationLabel.font = [UIFont systemFontOfSize:FONT_SIZE];
-    self.notificationLabel.backgroundColor = self.notificationLabelBackgroundColor;
-    self.notificationLabel.textColor = self.notificationLabelTextColor;
+    view.clipsToBounds = YES;
+    view.userInteractionEnabled = YES;
+    [view addGestureRecognizer:self.tapGestureRecognizer];
    switch (self.notificationAnimationInStyle) {
        case CWNotificationAnimationStyleTop:
-            self.notificationLabel.frame = [self getNotificationLabelTopFrame];
+            view.frame = [self getNotificationLabelTopFrame];
            break;
        case CWNotificationAnimationStyleBottom:
-            self.notificationLabel.frame = [self getNotificationLabelBottomFrame];
+            view.frame = [self getNotificationLabelBottomFrame];
            break;
        case CWNotificationAnimationStyleLeft:
-            self.notificationLabel.frame = [self getNotificationLabelLeftFrame];
+            view.frame = [self getNotificationLabelLeftFrame];
            break;
        case CWNotificationAnimationStyleRight:
-            self.notificationLabel.frame = [self getNotificationLabelRightFrame];
+            view.frame = [self getNotificationLabelRightFrame];
            break;
-            
    }
 }

+- (void)createNotificationLabelWithMessage:(NSString *)message
+{
+    self.notificationLabel = [ScrollLabel new];
+    self.notificationLabel.numberOfLines = self.multiline ? 0 : 1;
+    self.notificationLabel.text = message;
+    self.notificationLabel.textAlignment = NSTextAlignmentCenter;
+    self.notificationLabel.adjustsFontSizeToFitWidth = NO;
+    self.notificationLabel.font = self.notificationLabelFont;
+    self.notificationLabel.backgroundColor = self.notificationLabelBackgroundColor;
+    self.notificationLabel.textColor = self.notificationLabelTextColor;
+    [self setupNotificationView:self.notificationLabel];
+}
+
+- (void)createNotificationCustomView:(UIView *)view
+{
+    self.customView = [[UIView alloc] init];
+    // Doesn't use autoresizing masks so that we can create constraints below manually
+    [view setTranslatesAutoresizingMaskIntoConstraints:NO];
+    [self.customView addSubview:view];
+
+    // 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]];
+    [self.customView addConstraint:[NSLayoutConstraint constraintWithItem:view attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:self.customView attribute:NSLayoutAttributeTop multiplier:1.0 constant:0.0]];
+    [self.customView addConstraint:[NSLayoutConstraint constraintWithItem:view attribute:NSLayoutAttributeBottom relatedBy:NSLayoutRelationEqual toItem:self.customView attribute:NSLayoutAttributeBottom multiplier:1.0 constant:0.0]];
+
+    [self setupNotificationView:self.customView];
+}
+
 - (void)createNotificationWindow
 {
-    self.notificationWindow = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
+    self.notificationWindow = [[CWWindowContainer alloc] initWithFrame:[[[UIApplication sharedApplication] keyWindow] bounds]];
    self.notificationWindow.backgroundColor = [UIColor clearColor];
-    self.notificationWindow.userInteractionEnabled = NO;
+    self.notificationWindow.userInteractionEnabled = YES;
    self.notificationWindow.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
    self.notificationWindow.windowLevel = UIWindowLevelStatusBar;
-    self.notificationWindow.rootViewController = [UIViewController new];
-    self.notificationWindow.rootViewController.view.bounds = [self getNotificationLabelFrame];
+    CWViewController *rootViewController = [[CWViewController alloc] init];
+    [rootViewController setSupportedInterfaceOrientations:self.supportedInterfaceOrientations];
+    rootViewController.preferredStatusBarStyle = self.preferredStatusBarStyle;
+    self.notificationWindow.rootViewController = rootViewController;
+    self.notificationWindow.notificationHeight = [self getNotificationLabelHeight];
 }

 - (void)createStatusBarView
 {
    self.statusBarView = [[UIView alloc] initWithFrame:[self getNotificationLabelFrame]];
    self.statusBarView.clipsToBounds = YES;
-    UIView *statusBarImageView = [[UIScreen mainScreen] snapshotViewAfterScreenUpdates:YES];
-    [self.statusBarView addSubview:statusBarImageView];
+    if (self.notificationAnimationType == CWNotificationAnimationTypeReplace) {
+        UIView *statusBarImageView = [[UIScreen mainScreen] snapshotViewAfterScreenUpdates:YES];
+        [self.statusBarView addSubview:statusBarImageView];
+    }
    [self.notificationWindow.rootViewController.view addSubview:self.statusBarView];
    [self.notificationWindow.rootViewController.view sendSubviewToBack:self.statusBarView];
 }
@@ -150,7 +404,8 @@

 - (void)firstFrameChange
 {
-    self.notificationLabel.frame = [self getNotificationLabelFrame];
+    UIView *view = self.isCustomView ? self.customView : self.notificationLabel;
+    view.frame = [self getNotificationLabelFrame];
    switch (self.notificationAnimationInStyle) {
        case CWNotificationAnimationStyleTop:
            self.statusBarView.frame = [self getNotificationLabelBottomFrame];
@@ -169,14 +424,15 @@

 - (void)secondFrameChange
 {
+    UIView *view = self.isCustomView ? self.customView : self.notificationLabel;
    switch (self.notificationAnimationOutStyle) {
        case CWNotificationAnimationStyleTop:
            self.statusBarView.frame = [self getNotificationLabelBottomFrame];
            break;
        case CWNotificationAnimationStyleBottom:
            self.statusBarView.frame = [self getNotificationLabelTopFrame];
-            self.notificationLabel.layer.anchorPoint = CGPointMake(0.5f, 1.0f);
-            self.notificationLabel.center = CGPointMake(self.notificationLabel.center.x, [self getNotificationLabelHeight]);
+            view.layer.anchorPoint = CGPointMake(0.5f, 1.0f);
+            view.center = CGPointMake(view.center.x, [self getStatusBarOffset] + [self getNotificationLabelHeight]);
            break;
        case CWNotificationAnimationStyleLeft:
            self.statusBarView.frame = [self getNotificationLabelRightFrame];
@@ -189,70 +445,162 @@

 - (void)thirdFrameChange
 {
+    UIView *view = self.isCustomView ? self.customView : self.notificationLabel;
    self.statusBarView.frame = [self getNotificationLabelFrame];
    switch (self.notificationAnimationOutStyle) {
        case CWNotificationAnimationStyleTop:
-            self.notificationLabel.frame = [self getNotificationLabelTopFrame];
+            view.frame = [self getNotificationLabelTopFrame];
            break;
        case CWNotificationAnimationStyleBottom:
-            self.notificationLabel.transform = CGAffineTransformMakeScale(1.0f, 0.0f);
+            view.transform = CGAffineTransformMakeScale(1.0f, 0.01f);
            break;
        case CWNotificationAnimationStyleLeft:
-            self.notificationLabel.frame = [self getNotificationLabelLeftFrame];
+            view.frame = [self getNotificationLabelLeftFrame];
            break;
        case CWNotificationAnimationStyleRight:
-            self.notificationLabel.frame = [self getNotificationLabelRightFrame];
+            view.frame = [self getNotificationLabelRightFrame];
            break;
    }
 }

 # pragma mark - display notification

- (void)displayNotificationWithMessage:(NSString *)message forDuration:(CGFloat)duration
+- (void)displayNotificationWithMessage:(NSString *)message completion:(void (^)(void))completion
 {
    if (!self.notificationIsShowing) {
+        self.isCustomView = NO;
        self.notificationIsShowing = YES;
-        
+
        // create UIWindow
        [self createNotificationWindow];
-        
-        // create UILabel
+
+        // create ScrollLabel
        [self createNotificationLabelWithMessage:message];
-        
+
        // create status bar view
        [self createStatusBarView];
-        
+
        // add label to window
        [self.notificationWindow.rootViewController.view addSubview:self.notificationLabel];
        [self.notificationWindow.rootViewController.view bringSubviewToFront:self.notificationLabel];
        [self.notificationWindow setHidden:NO];
-        
+
        // checking for screen orientation change
-        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(screenOrientationChanged) name:UIApplicationDidChangeStatusBarOrientationNotification object:nil];
-        
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(updateStatusBarFrame) name:UIApplicationDidChangeStatusBarOrientationNotification object:nil];
+
+        // checking for status bar change
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(updateStatusBarFrame) name:UIApplicationWillChangeStatusBarFrameNotification object:nil];
+
        // animate
-        [UIView animateWithDuration:STATUS_BAR_ANIMATION_LENGTH animations:^{
+        [UIView animateWithDuration:self.notificationAnimationDuration animations:^{
            [self firstFrameChange];
        } completion:^(BOOL finished) {
-            [UIView animateWithDuration:duration - 2*STATUS_BAR_ANIMATION_LENGTH animations:^{
-                // potential animations while notification is showing
-            } completion:^(BOOL finished) {
-                [self secondFrameChange];
-                dispatch_time_t popTime = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(duration * NSEC_PER_SEC));
-                dispatch_after(popTime, dispatch_get_main_queue(), ^(void){
-                    [UIView animateWithDuration:STATUS_BAR_ANIMATION_LENGTH animations:^{
-                        [self thirdFrameChange];
-                    } completion:^(BOOL finished) {
-                        [self.notificationLabel removeFromSuperview];
-                        [self.statusBarView removeFromSuperview];
-                        self.notificationWindow = nil;
-                        self.notificationIsShowing = NO;
-                        [[NSNotificationCenter defaultCenter] removeObserver:self name:UIApplicationDidChangeStatusBarOrientationNotification object:nil];
-                    }];
-                });
-            }];
+            double delayInSeconds = [self.notificationLabel scrollTime];
+            perform_block_after_delay(delayInSeconds, ^{
+                [completion invoke];
+            });
        }];
    }
 }

+- (void)displayNotificationWithMessage:(NSString *)message forDuration:(NSTimeInterval)duration
+{
+    [self displayNotificationWithMessage:message completion:^{
+        self.dismissHandle = perform_block_after_delay(duration, ^{
+            [self dismissNotification];
+        });
+    }];
+}
+
+- (void)displayNotificationWithAttributedString:(NSAttributedString *)attributedString completion:(void (^)(void))completion
+{
+    [self displayNotificationWithMessage:[attributedString string] completion:completion];
+    [[self notificationLabel] setAttributedText:attributedString];
+}
+
+- (void)displayNotificationWithAttributedString:(NSAttributedString *)attributedString forDuration:(NSTimeInterval)duration
+{
+    [self displayNotificationWithMessage:[attributedString string] forDuration:duration];
+    [[self notificationLabel] setAttributedText:attributedString];
+}
+
+- (void)displayNotificationWithView:(UIView *)view completion:(void (^)(void))completion
+{
+    if (!self.notificationIsShowing) {
+        self.isCustomView = YES;
+        self.notificationIsShowing = YES;
+
+        // create window
+        [self createNotificationWindow];
+
+        // setup view
+        [self createNotificationCustomView:view];
+
+        // create status bar view
+        [self createStatusBarView];
+
+        // add view to window
+        UIView *rootView = self.notificationWindow.rootViewController.view;
+        [rootView addSubview:self.customView];
+        [rootView bringSubviewToFront:self.customView];
+        [self.notificationWindow setHidden:NO];
+
+        // checking for screen orientation change
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(updateStatusBarFrame) name:UIApplicationDidChangeStatusBarOrientationNotification object:nil];
+
+        // checking for status bar change
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(updateStatusBarFrame) name:UIApplicationWillChangeStatusBarFrameNotification object:nil];
+
+        // animate
+        [UIView animateWithDuration:self.notificationAnimationDuration animations:^{
+            [self firstFrameChange];
+        } completion:^(BOOL finished) {
+            [completion invoke];
+        }];
+    }
+}
+
+- (void)displayNotificationWithView:(UIView *)view forDuration:(NSTimeInterval)duration
+{
+    [self displayNotificationWithView:view completion:^{
+        self.dismissHandle = perform_block_after_delay(duration, ^{
+            [self dismissNotification];
+        });
+    }];
+}
+
+- (void)dismissNotificationWithCompletion:(void (^)(void))completion
+{
+    if (self.notificationIsShowing) {
+        cancel_delayed_block(self.dismissHandle);
+        self.notificationIsDismissing = YES;
+        [self secondFrameChange];
+        [UIView animateWithDuration:self.notificationAnimationDuration animations:^{
+            [self thirdFrameChange];
+        } completion:^(BOOL finished) {
+            UIView *view = self.isCustomView ? self.customView : self.notificationLabel;
+            [view removeFromSuperview];
+            [self.statusBarView removeFromSuperview];
+            [self.notificationWindow setHidden:YES];
+            self.notificationWindow = nil;
+            view = nil;
+            self.notificationIsShowing = NO;
+            self.notificationIsDismissing = NO;
+            [[NSNotificationCenter defaultCenter] removeObserver:self name:UIApplicationDidChangeStatusBarOrientationNotification object:nil];
+            [[NSNotificationCenter defaultCenter] removeObserver:self name:UIApplicationWillChangeStatusBarFrameNotification object:nil];
+            if (completion) {
+                completion();
+            }
+        }];
+    } else {
+        if (completion) {
+            completion();
+        }
+    }
+}
+
+- (void)dismissNotification
+{
+    [self dismissNotificationWithCompletion:nil];
+}
@end
@@ -1,6 +1,6 @@
 The MIT License (MIT)

-Copyright (c) 2013 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
@@ -1,7 +1,13 @@
 # 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.

+You can find the documentation [here](http://cocoadocs.org/docsets/CWStatusBarNotification/).
+
 ![demo](screenshots/demo.gif)

 ## Requirements
@@ -14,7 +20,7 @@ Works for iPhone and iPad.

 ### CocoaPods

-`pod 'CWStatusBarNotification', '~> 2.0.0'`
+`pod 'CWStatusBarNotification', '~> 2.3.4'`

 ### Manual

@@ -22,35 +28,67 @@ Copy the folder `CWStatusBarNotification` to your project.

 ## Usage

-***Note:** The previous version of this library implemented the notifications using a category. This version uses an object instead.*
-
 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:

-```
-notification.notificationLabelBackgroundColor = [UIColor redColor];
-notification.notificationLabelTextColor = [UIColor yellowColor];
+```objc
+notification.notificationLabelBackgroundColor = [UIColor blackColor];
+notification.notificationLabelTextColor = [UIColor greenColor];
 ```

 ![custom colors](screenshots/ss1.gif)
@@ -80,15 +118,42 @@ The default value for `notificationAnimationInStyle` is `CWNotificationAnimation

 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!
+
+* [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) 2013 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
@@ -107,5 +172,3 @@ The notifications will work in both screen orientations, however, screen rotatio
    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
    THE SOFTWARE.
-
-
Author	SHA1	Message	Date
Cezary Wojcik	e7d66aefe3	2.3.4	2016-01-07 23:57:28 -08:00
Cezary Wojcik	7eb79da4f0	2.3.3	2015-08-27 09:54:57 -07:00
Cezary Wojcik	0c103128dd	actually fixed conflict	2015-08-25 12:36:24 -07:00
Cezary Wojcik	fac5c91daa	fixed conflict	2015-08-25 12:34:49 -07:00
Cezary Wojcik	5c949092f5	2.3.2	2015-08-25 12:32:49 -07:00
Cezary Wojcik	cdc51f3243	Update README.md	2015-08-08 18:45:36 -07:00
Cezary Wojcik	7d1890f7c5	fixed typo in README	2015-07-12 19:15:12 -07:00
Cezary Wojcik	26d6eda4f5	updated README	2015-07-12 19:14:42 -07:00
Cezary Wojcik	9dfcc29703	2015	2015-07-11 23:13:16 -07:00
Cezary Wojcik	6d00f770ef	supported interface orientations	2015-07-11 14:53:09 -07:00
Cezary Wojcik	23a64f768d	2.3.1 custom notification animation duration	2015-07-11 14:49:01 -07:00
Cezary Wojcik	e3fd1677b1	CGFloat -> NSTimeInterval	2015-07-11 14:44:27 -07:00
Cezary Wojcik	dfbb1ed5f6	no need for this because of PCH	2015-07-11 14:42:07 -07:00
Cezary Wojcik	71aec53e1d	updated read	2015-07-11 14:38:22 -07:00
Cezary Wojcik	a24706854d	added one more doc comment	2015-07-11 14:35:51 -07:00
Cezary Wojcik	9dd9bcecb2	2.3.0	2015-07-11 14:27:26 -07:00
Cezary Wojcik	c5875f1311	Merge pull request #56 from benguild/master Quick fix for lack of NSAttributedString support. Could be improved.	2015-07-11 02:04:52 -07:00
Ben Guild	6d2a139fa0	Changing function and variable names to match UILabel's.	2015-06-14 15:41:36 +09:00
Ben Guild	1a1d1c5d38	Quick fix for lack of NSAttributedString support. Could be improved.	2015-06-14 15:33:04 +09:00
Cezary Wojcik	b87af9f288	2.2.6	2015-05-12 12:17:28 -07:00
Cezary Wojcik	975ca58291	2.2.5	2015-05-04 07:08:59 -07:00
Cezary Wojcik	d9d8c1d342	Merge pull request #50 from somethingkindawierd/master Fix calculation of navbar height	2015-05-01 15:39:11 -07:00
Jon Beebe	e700d781cc	Fix calculation of navbar height	2015-04-30 11:41:45 -05:00
Cezary Wojcik	6882883e21	2.2.4	2015-04-15 12:16:12 -07:00
Cezary Wojcik	00136b9d3c	2.2.3	2015-04-15 12:07:04 -07:00
Cezary Wojcik	437e5c5860	Merge pull request #49 from basecom/master Added the ability to hand over supportededInterfaceOrientations	2015-04-13 14:23:57 -07:00
Marius Landwehr	eef9cc818c	Added the ability to hand over supportededInterfaceOrientations for CWStatusBarNotification. This is optional and the standard value is to support all masks.	2015-04-13 14:07:49 +02:00
Cezary Wojcik	e9ba7bdeda	Merge pull request #48 from adamtootle/preferred-status-bar-style preferredStatusBarStyle	2015-04-10 20:16:30 -07:00
Adam Tootle	c70f81e35b	Adding a new CWViewController class and a new preferredStatusBarStyle property to CWStatusBarNotification for controlling the color of the status bar text in the overlay CWWindowContainer.	2015-04-09 08:32:11 -04:00
Cezary Wojcik	7bae7b4ddc	Merge pull request #43 from avgx/master Allow user to set the font for notificationLabel	2014-11-05 08:16:56 -08:00
avgx	bca16517c3	Allow user to set the font for notificationLabel	2014-11-05 12:23:26 +03:00
Cezary Wojcik	f4432a86c7	removed some whitespace	2014-10-21 22:20:40 -07:00
Cezary Wojcik	fa848141eb	updated demo gif	2014-10-21 20:59:21 -07:00
Cezary Wojcik	d1b09abe48	updated demo app	2014-10-21 20:47:35 -07:00
Cezary Wojcik	36e5ea38b6	2.2.2	2014-10-21 19:57:35 -07:00
Cezary Wojcik	c6fcfa1d2a	Merge pull request #42 from drumnkyle/master Fixing the fix to the hitTest	2014-10-21 19:44:36 -07:00
Kyle Sherman	70e603a058	Fixing the fix to the hitTest Missing parenthesis made the check pass for the whole screen. Fixed this issue.	2014-10-21 14:12:50 -07:00
Cezary Wojcik	e488b4c76b	Merge pull request #41 from drumnkyle/master Fixing issue #40	2014-10-21 13:13:42 -07:00
Kyle Sherman	f1d9606940	Fixing issue #40 Fixing issue #40 where a tap in the notification frame when it is in the style of NavigationBar would not be detected for the notification window.	2014-10-21 11:41:50 -07:00
Cezary Wojcik	93750ca9a2	cocoapods lied to me	2014-10-18 11:09:11 -07:00
Cezary Wojcik	34c81e7e93	2.2.1	2014-10-18 11:06:05 -07:00
Cezary Wojcik	9a9dfa63f1	Merge pull request #39 from drumnkyle/master Adding dismissNotificationWithCompletion method	2014-10-17 16:47:13 -07:00
Kyle Sherman	d01eb06cfb	Adding dismissNotificationWithCompletion method Added dismissNotificationWithCompletion method. Left the old method without completion intact for backwards compatibility.	2014-10-17 16:42:22 -07:00
Cezary Wojcik	9e4e2c7ccb	Merge pull request #38 from drumnkyle/master Added Switch to Demo App and Fixed Custom View Rotation Bug	2014-10-17 16:32:36 -07:00
Kyle Sherman	bbe0a06a1e	Fixed Auto Layout bug that didn't resize custom view version properly on rotation	2014-10-17 16:27:15 -07:00
Kyle Sherman	ff693f7381	Added a switch to the demo project to switch between status bar and notification bar styles to demonstrate the capability clearly.	2014-10-17 11:38:28 -07:00
Cezary Wojcik	4c1e52ca88	ready update	2014-10-16 17:12:27 -07:00
Cezary Wojcik	af4ded6872	2.2.0	2014-10-16 17:06:40 -07:00
Cezary Wojcik	81a87fa06d	Merge pull request #37 from drumnkyle/master Added the notion of a custom view in the notification	2014-10-16 16:50:23 -07:00
Kyle Sherman	1514f1a366	Adding the concept of a custom view Added methods to be able to display a custom view in the notification and added an example to the demo project.	2014-10-16 16:39:50 -07:00
Kyle Sherman	c5d8f86bc6	Merge pull request #1 from cezarywojcik/master Pulling in latest code	2014-10-16 13:10:22 -07:00
Cezary Wojcik	db643d42c7	updated readme	2014-10-09 22:28:57 -07:00
Cezary Wojcik	c4feb7c040	2.1.4	2014-10-09 16:28:38 -07:00
Cezary Wojcik	900e0367dd	Merge pull request #35 from drumnkyle/patch-1 Fixed the notificationStyle type.	2014-10-09 14:57:24 -07:00
Kyle Sherman	82d36ffbf2	Fixed the notificationStyle type. The notificationStyle property is of the wrong type, so it is unusable.	2014-10-09 14:51:59 -07:00
Cezary Wojcik	8b0884b278	2.1.3	2014-09-19 10:34:28 -07:00
Cezary Wojcik	fce4537adf	Merge pull request #33 from adomanico/issue/hittest Fixes issue window hitTest on iOS 7	2014-09-18 20:21:04 -07:00
adomanico	0e03636df6	Fixes issue window hitTest on iOS 7 The landscape window coordinate changes broke the CWWindowContainer hitTest function. This now handles iOS 7/8 gracefully.	2014-09-18 20:19:05 -07:00
Cezary Wojcik	3b27bd914b	2.1.2	2014-09-10 14:31:54 -07:00
Cezary Wojcik	234ebf1d4c	Merge pull request #29 from DocuSignDev/feature/ios8-status-bar-size Fix iOS 8 status bar width	2014-09-05 07:50:51 -05:00
Stephen Parish	8eda4da7c0	Add ios 7 compatibility to fix for ios 8 status bar widths	2014-09-05 00:47:45 -07:00
Stephen Parish	2a60603b7f	enable ios 8 compatibility by being able to trust status bar dimensions In iOS 8 status bar height and width are actually correct no matter the orientation now. Same for all UIWindows as well. Fixes #28	2014-09-05 00:34:02 -07:00
Cezary Wojcik	bd6b6522a8	Merge pull request #26 from ddwang/master renamed CompletionBlock to CWCompletionBlock to prevent typedef conflicts	2014-07-30 22:08:43 -05:00
Daniel Wang	7b8fd4cc5c	renamed CompletionBlock to CWCompletionBlock to prevent typedef conflicts	2014-07-30 14:26:50 -07:00
Cezary Wojcik	281d12eb46	in call status bar offset	2014-07-08 06:55:09 -05:00
Cezary Wojcik	7a05a62c16	added note about swift version to read me	2014-06-08 14:25:41 -07:00
Cezary Wojcik	8382cd9738	subclass UIWindow thanks to @dzenbot for this fix	2014-05-28 09:46:32 -07:00
Cezary Wojcik	317b8e6db5	Merge pull request #22 from epologee/patch-1 Set the notification window to hidden	2014-05-16 11:46:40 -07:00
Eric-Paul Lecluse	8c68f3e2cd	Set the notification window to hidden By setting the hidden flag, the OS will poll the status bar style of the original view controller. Without this flag, the status bar will always become black after the notification animation.	2014-05-16 19:02:11 +02:00
Cezary Wojcik	c8ba3fca9e	added dismiss on tap with ability to override	2014-03-30 17:55:12 -07:00
Cezary Wojcik	194f00b40a	updated readme with travis status image	2014-03-15 15:29:37 -07:00
Cezary Wojcik	2378a998fb	travis	2014-03-15 15:21:37 -07:00
Cezary Wojcik	9704c4a593	2.1.1	2014-03-15 15:09:34 -07:00
Cezary Wojcik	2504969cdf	fixed from bottom animation	2014-03-15 12:39:30 -07:00
Cezary Wojcik	34574e0309	Merge pull request #11 from mstrchrstphr/master Update README.md	2014-02-17 17:50:04 -08:00
Christopher Constable	3a0e5081b4	Update README.md	2014-02-17 19:49:00 -05:00
Cezary Wojcik	d68d5acaa0	Merge pull request #8 from dannybabiy/master Allow for longer text, and appearance options for when you don't have a visible status bar.	2013-12-26 22:31:18 -08:00
Danny Babiy	04c750b19f	allow for multiline	2013-12-26 21:57:19 -05:00
Danny Babiy	7169617a68	allow to set a custom label height	2013-12-26 14:22:05 -05:00
Danny Babiy	e6cee95c7d	allow for overlay type of animation	2013-12-26 14:19:53 -05:00
Danny Babiy	2431285d57	scroll long text	2013-12-26 12:40:30 -05:00
Cezary Wojcik	d64336e03e	cocoapod	2013-11-17 10:27:20 -08:00
Cezary Wojcik	e2d2826e6c	2.1.0 added custom display/dismiss methods	2013-11-17 10:11:56 -08:00
Cezary Wojcik	8bd01ad27c	Updated screenshot	2013-11-17 00:57:43 -08:00
Cezary Wojcik	2c9bc8677c	Updated README and screenshots	2013-11-17 00:56:20 -08:00