Merge branch 'master' of github.com:andreamazz/AMPopTip

andreamazz · Jun 10, 2015 · ab9818d · ab9818d
2 parents 9f78a93 + a374f40
commit ab9818d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/AMPopTip.podspec b/AMPopTip.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "AMPopTip"
-  s.version      = "0.9"
+  s.version      = "0.9.1"
   s.summary      = "Animated popover, great for subtle UI tips and onboarding."
 
   s.description  = <<-DESC
@@ -13,7 +13,7 @@ Pod::Spec.new do |s|
   s.homepage     = "https://github.com/andreamazz/AMPopTip"
   s.license      = { :type => 'MIT', :file => 'LICENSE' }
   s.author       = { "Andrea Mazzini" => "andrea.mazzini@gmail.com" }
-  s.source       = { :git => "https://github.com/andreamazz/AMPopTip.git", :tag => '0.9' }
+  s.source       = { :git => "https://github.com/andreamazz/AMPopTip.git", :tag => s.version }
   s.platform     = :ios, '7.0'
   s.source_files = 'AMPopTip', '*.{h,m}'
   s.requires_arc = true

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;