2.2.1

Merge pull request #39 from drumnkyle/master
Adding dismissNotificationWithCompletion method
2014-10-18 11:06:05 -07:00 · 2014-10-17 16:47:13 -07:00 · 2014-10-17 16:42:22 -07:00 · 2014-10-17 16:32:36 -07:00 · 2014-10-17 16:27:15 -07:00 · 2014-10-17 11:38:28 -07:00
10 changed files with 256 additions and 39 deletions
@@ -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 */; };
@@ -34,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; };
@@ -114,6 +116,7 @@
 			children = (
 				5E2FFB6518367C01003333F8 /* AppDelegate.h */,
 				5E2FFB6618367C01003333F8 /* AppDelegate.m */,
+				370883CD19F08756000E79D6 /* CustomView.xib */,
 				5E2FFB8918367C75003333F8 /* View Controllers */,
 				5E2FFB6818367C01003333F8 /* Images.xcassets */,
 				5E2FFB5D18367C01003333F8 /* Supporting Files */,
@@ -240,6 +243,7 @@
 			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 */,
@@ -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",
@@ -16,10 +16,13 @@
@property (weak, nonatomic) IBOutlet UITextField *txtNotificationMessage;
@property (weak, nonatomic) IBOutlet UISegmentedControl *segFromStyle;
@property (weak, nonatomic) IBOutlet UISegmentedControl *segToStyle;
+@property (weak, nonatomic) IBOutlet UILabel *notificationStyleLabel;

@property (strong, nonatomic) CWStatusBarNotification *notification;

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

@end
@@ -60,6 +60,12 @@
    [self updateDurationLabel];
 }

+- (IBAction)notificationStyleChanged:(UISwitch *)sender
+{
+    self.notificationStyleLabel.text = sender.on ? @"Status Bar" : @"Navigation Bar";
+    self.notification.notificationStyle = sender.on ? CWNotificationStyleStatusBarNotification : CWNotificationStyleNavigationBarNotification;
+}
+
 # pragma mark - show notification

 - (IBAction)btnShowNotificationPressed:(UIButton *)sender
@@ -69,4 +75,11 @@
    [self.notification displayNotificationWithMessage:self.txtNotificationMessage.text forDuration:self.sliderDuration.value];
 }

+- (IBAction)btnShowCustomNotificationPressed:(UIButton *)sender {
+    self.notification.notificationAnimationInStyle = self.segFromStyle.selectedSegmentIndex;
+    self.notification.notificationAnimationOutStyle = self.segToStyle.selectedSegmentIndex;
+    UIView *view = [[NSBundle mainBundle] loadNibNamed:@"CustomView" owner:nil options:nil][0];
+    [self.notification displayNotificationWithView:view forDuration:self.sliderDuration.value];
+}
+
@end
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6245" systemVersion="13E28" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6245" systemVersion="13F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES">
    <dependencies>
        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6238"/>
        <capability name="Alignment constraints to the first baseline" minToolsVersion="6.0"/>
@@ -8,6 +8,7 @@
        <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="notificationStyleLabel" destination="vCP-z3-d8I" id="w8D-aD-anT"/>
                <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"/>
@@ -72,15 +73,54 @@
                        <segment title="From Right"/>
                    </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="117" y="297" width="180" height="30"/>
+                    <state key="normal" title="Show Custom 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>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jdx-ge-BUc">
+                    <rect key="frame" x="110" y="332" width="195" height="45"/>
+                    <subviews>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Status Bar" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vCP-z3-d8I">
+                            <rect key="frame" x="2" y="12" width="81" height="21"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                            <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="kMg-IK-wId">
+                            <rect key="frame" x="129" y="7" width="51" height="31"/>
+                            <connections>
+                                <action selector="notificationStyleChanged:" destination="-1" eventType="valueChanged" id="l5q-T2-kkR"/>
+                            </connections>
+                        </switch>
+                    </subviews>
+                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                    <constraints>
+                        <constraint firstItem="vCP-z3-d8I" firstAttribute="centerY" secondItem="kMg-IK-wId" secondAttribute="centerY" id="3SI-Am-gjr"/>
+                        <constraint firstItem="vCP-z3-d8I" firstAttribute="leading" secondItem="jdx-ge-BUc" secondAttribute="leading" constant="2" id="JX1-pS-6MA"/>
+                        <constraint firstAttribute="width" constant="195" id="ULf-xN-mdP"/>
+                        <constraint firstAttribute="trailing" secondItem="kMg-IK-wId" secondAttribute="trailing" constant="17" id="UMt-vg-87u"/>
+                        <constraint firstAttribute="centerY" secondItem="vCP-z3-d8I" secondAttribute="centerY" id="VC6-YO-6GP"/>
+                        <constraint firstAttribute="height" constant="45" id="x6g-OL-a8r"/>
+                    </constraints>
+                </view>
            </subviews>
            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
            <constraints>
+                <constraint firstItem="E8G-aN-rjr" firstAttribute="top" secondItem="DId-6z-9ak" secondAttribute="bottom" constant="10" id="65O-jS-huU"/>
                <constraint firstItem="lnj-T4-sfz" firstAttribute="leading" secondItem="nHX-St-Osi" secondAttribute="leading" id="7da-li-6Kn"/>
                <constraint firstItem="vWx-wx-d32" firstAttribute="leading" secondItem="1" secondAttribute="leading" constant="20" id="8hY-Bj-MI2"/>
                <constraint firstItem="oAK-DR-B27" firstAttribute="leading" secondItem="nHX-St-Osi" secondAttribute="trailing" constant="8" symbolic="YES" id="9ki-g4-vZj"/>
+                <constraint firstItem="jdx-ge-BUc" firstAttribute="centerX" secondItem="E8G-aN-rjr" secondAttribute="centerX" id="CSN-1b-hyf"/>
                <constraint firstItem="oAK-DR-B27" firstAttribute="trailing" secondItem="lnj-T4-sfz" secondAttribute="trailing" id="DF9-5s-ORR"/>
                <constraint firstItem="nHX-St-Osi" firstAttribute="firstBaseline" secondItem="oAK-DR-B27" secondAttribute="firstBaseline" id="ELp-HE-4nH"/>
                <constraint firstItem="VqG-wR-oYI" firstAttribute="top" secondItem="nHX-St-Osi" secondAttribute="bottom" constant="7" id="I7c-GM-lko"/>
+                <constraint firstItem="jdx-ge-BUc" firstAttribute="top" secondItem="E8G-aN-rjr" secondAttribute="bottom" constant="5" id="PQJ-pr-K5R"/>
                <constraint firstItem="vWx-wx-d32" firstAttribute="top" secondItem="1" secondAttribute="top" constant="78" id="UEb-Dv-gVI"/>
                <constraint firstItem="DId-6z-9ak" firstAttribute="centerX" secondItem="VqG-wR-oYI" secondAttribute="centerX" id="UR8-ES-cIh"/>
                <constraint firstItem="DId-6z-9ak" firstAttribute="top" secondItem="VqG-wR-oYI" secondAttribute="bottom" constant="10" id="ZgW-j6-ji5"/>
@@ -90,6 +130,7 @@
                <constraint firstItem="lnj-T4-sfz" firstAttribute="top" secondItem="Bza-7R-910" secondAttribute="bottom" constant="8" symbolic="YES" id="iOO-Sk-CU0"/>
                <constraint firstItem="Bza-7R-910" firstAttribute="trailing" secondItem="lnj-T4-sfz" secondAttribute="trailing" id="pZ0-3h-ZuL"/>
                <constraint firstItem="VqG-wR-oYI" firstAttribute="leading" secondItem="nHX-St-Osi" secondAttribute="leading" id="qTt-Y1-xfG"/>
+                <constraint firstItem="E8G-aN-rjr" firstAttribute="centerX" secondItem="DId-6z-9ak" secondAttribute="centerX" id="qrX-mR-Hox"/>
                <constraint firstItem="lnj-T4-sfz" firstAttribute="leading" secondItem="Bza-7R-910" secondAttribute="leading" id="tXW-Jb-JXr"/>
                <constraint firstItem="vWx-wx-d32" firstAttribute="centerX" secondItem="1" secondAttribute="centerX" id="ulj-gO-yBc"/>
                <constraint firstItem="nHX-St-Osi" firstAttribute="top" secondItem="lnj-T4-sfz" secondAttribute="bottom" constant="9" id="w3P-gu-lkL"/>
@@ -1,6 +1,8 @@
+source 'https://github.com/CocoaPods/Specs.git'
+
 Pod::Spec.new do |s|
  s.name         = "CWStatusBarNotification"
-  s.version      = "2.1.4"
+  s.version      = "2.2.1"
  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"
@@ -40,6 +40,7 @@ typedef NS_ENUM(NSInteger, CWNotificationAnimationType) {
@property (strong, nonatomic) UIColor *notificationLabelBackgroundColor;
@property (strong, nonatomic) UIColor *notificationLabelTextColor;
@property (assign, nonatomic) CGFloat notificationLabelHeight;
+@property (strong, nonatomic) UIView *customView;
@property (assign, nonatomic) BOOL multiline;

@property (strong, nonatomic) UIView *statusBarView;
@@ -57,6 +58,9 @@ typedef NS_ENUM(NSInteger, CWNotificationAnimationType) {

 - (void)displayNotificationWithMessage:(NSString *)message forDuration:(CGFloat)duration;
 - (void)displayNotificationWithMessage:(NSString *)message completion:(void (^)(void))completion;
+- (void)displayNotificationWithView:(UIView *)view forDuration:(CGFloat)duration;
+- (void)displayNotificationWithView:(UIView *)view completion:(void (^)(void))completion;
 - (void)dismissNotification;
+- (void)dismissNotificationWithCompletion:(void(^)(void))completion;

@end
@@ -146,12 +146,13 @@ static void cancel_delayed_block(CWDelayedBlockHandle delayedHandle)

@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, notificationWindow, customView;

@synthesize statusBarView;

@@ -169,6 +170,7 @@ static void cancel_delayed_block(CWDelayedBlockHandle delayedHandle)
        self.notificationAnimationOutStyle = CWNotificationAnimationStyleBottom;
        self.notificationAnimationType = CWNotificationAnimationTypeReplace;
        self.notificationIsDismissing = NO;
+        self.isCustomView = NO;

        // create tap recognizer
        self.tapGestureRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(notificationTapped:)];
@@ -265,7 +267,8 @@ static void cancel_delayed_block(CWDelayedBlockHandle delayedHandle)

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

@@ -278,6 +281,27 @@ static void cancel_delayed_block(CWDelayedBlockHandle delayedHandle)

 # pragma mark - display helpers

+- (void)setupNotificationView:(UIView *)view
+{
+    view.clipsToBounds = YES;
+    view.userInteractionEnabled = YES;
+    [view addGestureRecognizer:self.tapGestureRecognizer];
+    switch (self.notificationAnimationInStyle) {
+        case CWNotificationAnimationStyleTop:
+            view.frame = [self getNotificationLabelTopFrame];
+            break;
+        case CWNotificationAnimationStyleBottom:
+            view.frame = [self getNotificationLabelBottomFrame];
+            break;
+        case CWNotificationAnimationStyleLeft:
+            view.frame = [self getNotificationLabelLeftFrame];
+            break;
+        case CWNotificationAnimationStyleRight:
+            view.frame = [self getNotificationLabelRightFrame];
+            break;
+    }
+}
+
 - (void)createNotificationLabelWithMessage:(NSString *)message
 {
    self.notificationLabel = [ScrollLabel new];
@@ -288,23 +312,24 @@ static void cancel_delayed_block(CWDelayedBlockHandle delayedHandle)
    self.notificationLabel.font = [UIFont systemFontOfSize:FONT_SIZE];
    self.notificationLabel.backgroundColor = self.notificationLabelBackgroundColor;
    self.notificationLabel.textColor = self.notificationLabelTextColor;
-    self.notificationLabel.clipsToBounds = YES;
-    self.notificationLabel.userInteractionEnabled = YES;
-    [self.notificationLabel addGestureRecognizer:self.tapGestureRecognizer];
-    switch (self.notificationAnimationInStyle) {
-        case CWNotificationAnimationStyleTop:
-            self.notificationLabel.frame = [self getNotificationLabelTopFrame];
-            break;
-        case CWNotificationAnimationStyleBottom:
-            self.notificationLabel.frame = [self getNotificationLabelBottomFrame];
-            break;
-        case CWNotificationAnimationStyleLeft:
-            self.notificationLabel.frame = [self getNotificationLabelLeftFrame];
-            break;
-        case CWNotificationAnimationStyleRight:
-            self.notificationLabel.frame = [self getNotificationLabelRightFrame];
-            break;
-    }
+    [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 constained 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
@@ -333,7 +358,8 @@ static void cancel_delayed_block(CWDelayedBlockHandle delayedHandle)

 - (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];
@@ -352,14 +378,15 @@ static void cancel_delayed_block(CWDelayedBlockHandle delayedHandle)

 - (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 getStatusBarOffset] + [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];
@@ -372,19 +399,20 @@ static void cancel_delayed_block(CWDelayedBlockHandle delayedHandle)

 - (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.01f);
+            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;
    }
 }
@@ -394,6 +422,7 @@ static void cancel_delayed_block(CWDelayedBlockHandle delayedHandle)
 - (void)displayNotificationWithMessage:(NSString *)message completion:(void (^)(void))completion
 {
    if (!self.notificationIsShowing) {
+        self.isCustomView = NO;
        self.notificationIsShowing = YES;

        // create UIWindow
@@ -428,7 +457,48 @@ static void cancel_delayed_block(CWDelayedBlockHandle delayedHandle)
    }
 }

+- (void)displayNotificationWithView:(UIView *)view completion:(void (^)(void))completion
+{
+    if (!self.notificationIsShowing) {
+        self.isCustomView = YES;
+        self.notificationIsShowing = YES;
+        
+        // create UIWindow
+        [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:STATUS_BAR_ANIMATION_LENGTH animations:^{
+            [self firstFrameChange];
+        } completion:^(BOOL finished) {
+            [completion invoke];
+        }];
+    }
+}
+
 - (void)dismissNotification
+{
+    [self dismissNotificationWithCompletion:nil];
+}
+
+- (void)dismissNotificationWithCompletion:(void (^)(void))completion
 {
    if (self.notificationIsShowing) {
        cancel_delayed_block(self.dismissHandle);
@@ -437,16 +507,24 @@ static void cancel_delayed_block(CWDelayedBlockHandle delayedHandle)
        [UIView animateWithDuration:STATUS_BAR_ANIMATION_LENGTH animations:^{
            [self thirdFrameChange];
        } completion:^(BOOL finished) {
-            [self.notificationLabel removeFromSuperview];
+            UIView *view = self.isCustomView ? self.customView : self.notificationLabel;
+            [view removeFromSuperview];
            [self.statusBarView removeFromSuperview];
            [self.notificationWindow setHidden:YES];
            self.notificationWindow = nil;
-            self.notificationLabel = 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();
+        }
    }
 }

@@ -459,4 +537,13 @@ static void cancel_delayed_block(CWDelayedBlockHandle delayedHandle)
    }];
 }

+- (void)displayNotificationWithView:(UIView *)view forDuration:(CGFloat)duration
+{
+    [self displayNotificationWithView:view completion:^{
+        self.dismissHandle = perform_block_after_delay(duration, ^{
+            [self dismissNotification];
+        });
+    }];
+}
+
@end
@@ -18,7 +18,7 @@ Works for iPhone and iPad.

 ### CocoaPods

-`pod 'CWStatusBarNotification', '~> 2.1.4'`
+`pod 'CWStatusBarNotification', '~> 2.2.1'`

 ### Manual

@@ -30,25 +30,26 @@ Copy the folder `CWStatusBarNotification` to your project.

 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];
@@ -60,17 +61,16 @@ The default behavior when the notification is tapped is to dismiss it. However,

 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) {
@@ -86,7 +86,7 @@ First of all, you can customize the background color and text color using the fo

 Example:

-```
+```objc
 notification.notificationLabelBackgroundColor = [UIColor blackColor];
 notification.notificationLabelTextColor = [UIColor greenColor];
 ```
@@ -118,10 +118,36 @@ 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](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)
+
 ## License

    The MIT License (MIT)
Author	SHA1	Message	Date
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