Fix #39

andreamazz · May 28, 2015 · cf92298 · cf92298
1 parent fb122be
commit cf92298
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/AMPopTip/AMPopTip.m b/AMPopTip/AMPopTip.m
@@ -562,7 +562,7 @@ - (void)floatAnimation {
 			break;
 	}
 
-	[UIView animateWithDuration:(self.actionAnimationIn / 2) delay:self.actionDelayIn options:(UIViewAnimationOptionRepeat | UIViewAnimationOptionBeginFromCurrentState | UIViewAnimationOptionCurveEaseInOut | UIViewAnimationOptionAutoreverse) animations:^{
+	[UIView animateWithDuration:(self.actionAnimationIn / 2) delay:self.actionDelayIn options:(UIViewAnimationOptionRepeat | UIViewAnimationOptionBeginFromCurrentState | UIViewAnimationOptionCurveEaseInOut | UIViewAnimationOptionAutoreverse | UIViewAnimationOptionAllowUserInteraction) animations:^{
 		self.transform = CGAffineTransformMakeTranslation(xOffset, yOffset);
 	} completion:nil];
 }
@@ -588,7 +588,7 @@ - (void)bounceAnimation {
             break;
     }
 
-    [UIView animateWithDuration:(self.actionAnimationIn / 10) delay:self.actionDelayIn options:(UIViewAnimationOptionCurveEaseIn) animations:^{
+    [UIView animateWithDuration:(self.actionAnimationIn / 10) delay:self.actionDelayIn options:(UIViewAnimationOptionCurveEaseIn | UIViewAnimationOptionAllowUserInteraction) animations:^{
         self.transform = CGAffineTransformMakeTranslation(xOffset, yOffset);
     } completion:^(BOOL finished) {
         [UIView animateWithDuration:(self.actionAnimationIn - self.actionAnimationIn / 10) delay:0 usingSpringWithDamping:0.4 initialSpringVelocity:1 options:0 animations:^{
@@ -602,7 +602,7 @@ - (void)bounceAnimation {
 }
 
 - (void)pulseAnimation {
-    [UIView animateWithDuration:(self.actionAnimationIn / 2) delay:self.actionDelayIn options:(UIViewAnimationOptionRepeat | UIViewAnimationOptionBeginFromCurrentState | UIViewAnimationOptionCurveEaseInOut | UIViewAnimationOptionAutoreverse) animations:^{
+    [UIView animateWithDuration:(self.actionAnimationIn / 2) delay:self.actionDelayIn options:(UIViewAnimationOptionRepeat | UIViewAnimationOptionBeginFromCurrentState | UIViewAnimationOptionCurveEaseInOut | UIViewAnimationOptionAutoreverse | UIViewAnimationOptionAllowUserInteraction) animations:^{
         self.transform = CGAffineTransformMakeScale(self.actionPulseOffset, self.actionPulseOffset);
     } completion:nil];
 }

diff --git a/PopTipDemo/PopTipDemo/AMViewController.m b/PopTipDemo/PopTipDemo/AMViewController.m
@@ -52,6 +52,11 @@ - (IBAction)actionButton:(UIButton *)sender
     }
 
 
+    self.popTip.entranceAnimation = AMPopTipEntranceAnimationNone;
+    self.popTip.actionAnimation = AMPopTipActionAnimationFloat;
+
+    self.popTip.shouldDismissOnTap = YES;
+
     /*  Custom entrance animation  */
 //    self.popTip.entranceAnimation = AMPopTipEntranceAnimationCustom;
 //    __weak AMViewController *weakSelf = self;