Support for setting gravity animation magnitude

mhtranbn · Feb 16, 2014 · f8819a8 · f8819a8
1 parent bc4a8e1
commit f8819a8
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 12 deletions.
diff --git a/CRToast/CRToast.h b/CRToast/CRToast.h
@@ -46,6 +46,8 @@ extern NSString *const kCRToastAnimationOutTimeIntervalKey;
 extern NSString *const kCRToastAnimationSpringDampingKey;
 extern NSString *const kCRToastAnimationSpringInitialVelocityKey;
 
+extern NSString *const kCRToastAnimationGravityMagnitudeKey;
+
 extern NSString *const kCRToastTextKey;
 extern NSString *const kCRToastFontKey;
 extern NSString *const kCRToastTextColorKey;

diff --git a/CRToast/CRToast.m b/CRToast/CRToast.m
@@ -41,7 +41,8 @@ @interface CRToast : NSObject
 @property (nonatomic, readonly) NSTimeInterval animateOutTimeInterval;
 
 @property (nonatomic, readonly) CGFloat animationSpringDamping;
-@property (nonatomic, readonly) CGFloat animationInitialVelocity;
+@property (nonatomic, readonly) CGFloat animationSpringInitialVelocity;
+@property (nonatomic, readonly) CGFloat animationGravityMagnitude;
 
 @property (nonatomic, readonly) NSString *text;
 @property (nonatomic, readonly) UIFont *font;
@@ -85,6 +86,7 @@ @interface CRToastView : UIView
 
 NSString *const kCRToastAnimationSpringDampingKey           = @"kCRToastAnimationSpringDampingKey";
 NSString *const kCRToastAnimationSpringInitialVelocityKey   = @"kCRToastAnimateSpringVelocityKey";
+NSString *const kCRToastAnimationGravityMagnitudeKey        = @"kCRToastAnimationGravityMagnitudeKey";
 
 NSString *const kCRToastTextKey                             = @"kCRToastTextKey";
 NSString *const kCRToastFontKey                             = @"kCRToastFontKey";
@@ -112,6 +114,7 @@ @interface CRToastView : UIView
 
 static CGFloat                  kCRSpringDampingDefault                 = 0.6;
 static CGFloat                  kCRSpringInitialVelocityDefault         = 1.0;
+static CGFloat                  kCRGravityMagnitudeDefault              = 1.0;
 
 static NSString *               kCRTextDefault                          = @"";
 static UIFont   *               kCRFontDefault                          = nil;
@@ -209,15 +212,16 @@ + (void)setDefaultOptions:(NSDictionary*)defaultOptions {
 
     if (defaultOptions[kCRToastAnimationInTypeKey])                 kCRAnimationTypeDefaultIn               = [defaultOptions[kCRToastAnimationInTypeKey] integerValue];
     if (defaultOptions[kCRToastAnimationOutTypeKey])                kCRAnimationTypeDefaultOut              = [defaultOptions[kCRToastAnimationOutTypeKey] integerValue];
-    if (defaultOptions[kCRToastAnimationInDirectionKey])                kCRInAnimationDirectionDefault              = [defaultOptions[kCRToastAnimationInDirectionKey] integerValue];
-    if (defaultOptions[kCRToastAnimationOutDirectionKey])               kCROutAnimationDirectionDefault             = [defaultOptions[kCRToastAnimationOutDirectionKey] integerValue];
+    if (defaultOptions[kCRToastAnimationInDirectionKey])            kCRInAnimationDirectionDefault              = [defaultOptions[kCRToastAnimationInDirectionKey] integerValue];
+    if (defaultOptions[kCRToastAnimationOutDirectionKey])           kCROutAnimationDirectionDefault             = [defaultOptions[kCRToastAnimationOutDirectionKey] integerValue];
 
     if (defaultOptions[kCRToastAnimationInTimeIntervalKey])         kCRAnimateInTimeIntervalDefault         = [defaultOptions[kCRToastAnimationInTimeIntervalKey] doubleValue];
     if (defaultOptions[kCRToastTimeIntervalKey])                    kCRTimeIntervalDefault                  = [defaultOptions[kCRToastTimeIntervalKey] doubleValue];
     if (defaultOptions[kCRToastAnimationOutTimeIntervalKey])        kCRAnimateOutTimeIntervalDefault        = [defaultOptions[kCRToastAnimationOutTimeIntervalKey] doubleValue];
 
     if (defaultOptions[kCRToastAnimationSpringDampingKey])          kCRSpringDampingDefault                 = [defaultOptions[kCRToastAnimationSpringDampingKey] floatValue];
     if (defaultOptions[kCRToastAnimationSpringInitialVelocityKey])  kCRSpringInitialVelocityDefault         = [defaultOptions[kCRToastAnimationSpringInitialVelocityKey] floatValue];
+    if (defaultOptions[kCRToastAnimationGravityMagnitudeKey])       kCRGravityMagnitudeDefault              = [defaultOptions[kCRToastAnimationGravityMagnitudeKey] floatValue];
 
     if (defaultOptions[kCRToastTextKey])                            kCRTextDefault                          = defaultOptions[kCRToastTextKey];
     if (defaultOptions[kCRToastFontKey])                            kCRFontDefault                          = defaultOptions[kCRToastFontKey];
@@ -319,7 +323,7 @@ - (NSTimeInterval)animateOutTimeInterval {
     kCRAnimateOutTimeIntervalDefault;
 }
 
-- (CGFloat)animationInitialVelocity {
+- (CGFloat)animationSpringInitialVelocity {
     return _options[kCRToastAnimationSpringInitialVelocityKey] ?
     [_options[kCRToastAnimationSpringInitialVelocityKey] floatValue] :
     kCRSpringInitialVelocityDefault;
@@ -331,6 +335,12 @@ - (CGFloat)animationSpringDamping {
     kCRSpringDampingDefault;
 }
 
+- (CGFloat)animationGravityMagnitude {
+    return _options[kCRToastAnimationGravityMagnitudeKey] ?
+    [_options[kCRToastAnimationGravityMagnitudeKey] floatValue] :
+    kCRGravityMagnitudeDefault;
+}
+
 - (NSString*)text {
     return _options[kCRToastTextKey] ?: kCRTextDefault;
 }
@@ -663,7 +673,7 @@ - (void)displayNotification:(CRToast*)notification {
 
     void (^inwardAnimationsCompletionBlock)(BOOL) = ^void(BOOL finished) {
         statusBarView.frame = notification.statusBarViewAnimationFrame2;
-        switch (notification.inAnimationType) {
+        switch (notification.outAnimationType) {
             case CRToastAnimationTypeLinear: {
             [UIView animateWithDuration:notification.animateOutTimeInterval
                                   delay:notification.timeInterval
@@ -675,7 +685,7 @@ - (void)displayNotification:(CRToast*)notification {
             [UIView animateWithDuration:notification.animateOutTimeInterval
                                   delay:notification.timeInterval
                  usingSpringWithDamping:notification.animationSpringDamping
-                  initialSpringVelocity:notification.animationInitialVelocity
+                  initialSpringVelocity:notification.animationSpringInitialVelocity
                                 options:0
                              animations:outwardAnimationsBlock
                              completion:outwardAnimationsCompletionBlock];
@@ -686,6 +696,7 @@ - (void)displayNotification:(CRToast*)notification {
                 [_animator removeAllBehaviors];
                 UIGravityBehavior *gravity = [[UIGravityBehavior alloc]initWithItems:@[notificationView]];            ;
                 gravity.gravityDirection = notification.outGravityDirection;
+                gravity.magnitude = notification.animationGravityMagnitude;
                 UICollisionBehavior *collision = [[UICollisionBehavior alloc] initWithItems:@[notificationView]];
                 collision.collisionDelegate = self;
                 [collision addBoundaryWithIdentifier:kCRToastManagerCollisionBoundryIdentifier
@@ -710,7 +721,7 @@ - (void)displayNotification:(CRToast*)notification {
             [UIView animateWithDuration:notification.animateInTimeInterval
                                   delay:0.0
                  usingSpringWithDamping:notification.animationSpringDamping
-                  initialSpringVelocity:notification.animationInitialVelocity
+                  initialSpringVelocity:notification.animationSpringInitialVelocity
                                 options:0
                              animations:inwardAnimationsBlock
                              completion:inwardAnimationsCompletionBlock];
@@ -720,14 +731,14 @@ - (void)displayNotification:(CRToast*)notification {
             [_animator removeAllBehaviors];
             UIGravityBehavior *gravity = [[UIGravityBehavior alloc]initWithItems:@[notificationView]];
             gravity.gravityDirection = notification.inGravityDirection;
+            gravity.magnitude = notification.animationGravityMagnitude;
             UICollisionBehavior *collision = [[UICollisionBehavior alloc] initWithItems:@[notificationView]];
             collision.collisionDelegate = self;
             [collision addBoundaryWithIdentifier:kCRToastManagerCollisionBoundryIdentifier
                                        fromPoint:notification.inCollisionPoint1
                                          toPoint:notification.inCollisionPoint2];
             [_animator addBehavior:gravity];
             [_animator addBehavior:collision];
-
             self.gravityAnimationCompletionBlock = inwardAnimationsCompletionBlock;
         }
             break;
@@ -747,7 +758,6 @@ - (BOOL)showingNotification {;
 - (void)collisionBehavior:(UICollisionBehavior*)behavior
       endedContactForItem:(id <UIDynamicItem>)item
    withBoundaryIdentifier:(id <NSCopying>)identifier {
-    NSLog(@"contact");
     CRToastView *notificationView = (CRToastView*)item;
     if (self.gravityAnimationCompletionBlock) {
         void (^gravityCompletionBlock)(BOOL) = [self.gravityAnimationCompletionBlock copy];
@@ -757,4 +767,5 @@ - (void)collisionBehavior:(UICollisionBehavior*)behavior
         });
     }
 }
+
 @end
diff --git a/CRToastDemo/MainViewController.m b/CRToastDemo/MainViewController.m
@@ -122,8 +122,8 @@ - (NSDictionary*)options {
                                       kCRToastTimeIntervalKey                   : @(self.sliderDuration.value),
                                       kCRToastAnimationInTypeKey                : @(toastAnimationTypeFromSegmentedControl(_animationTypeSegmentedControl)),
                                       kCRToastAnimationOutTypeKey               : @(toastAnimationTypeFromSegmentedControl(_animationTypeSegmentedControl)),
-                                      kCRToastAnimationInDirectionKey               : @(self.segFromDirection.selectedSegmentIndex),
-                                      kCRToastAnimationOutDirectionKey              : @(self.segToDirection.selectedSegmentIndex)} mutableCopy];
+                                      kCRToastAnimationInDirectionKey           : @(self.segFromDirection.selectedSegmentIndex),
+                                      kCRToastAnimationOutDirectionKey          : @(self.segToDirection.selectedSegmentIndex)} mutableCopy];
     if (self.showImageSwitch.on) {
         options[kCRToastImageKey] = [UIImage imageNamed:@"alert_icon.png"];
     }

diff --git a/README.md b/README.md
@@ -67,7 +67,8 @@ Generates this
 
 `CRToast` also allows for animation customization. This includes.
 
-- Animation Type (Linear or Spring)
+- Animation Type (Linear, Spring or Gravity)
+- Animation Physics Coefficients (Spring Damping, Spring Initial Velocity, Gravity Magnitude)
 - Presentation Type (Slide over bars or push content out)
 - Direction (Enter and exit in any direction)
 - Enter, Stay on Screen and Exit Timing