Permalink
Browse files

Fix some issues

  • Loading branch information...
1 parent 51b9938 commit a13139b13fd7fa64d0db3e1e2983e04748ad4c91 @yfme yfme committed Feb 26, 2013
Showing with 8 additions and 8 deletions.
  1. +2 −0 .gitignore
  2. +1 −3 PopoverView/PopoverView.h
  3. +5 −5 PopoverView/PopoverView.m
View
@@ -3,3 +3,5 @@ build/
.DS_Store
*.xcuserstate
+
+*.xcscheme
@@ -9,9 +9,7 @@
#import <UIKit/UIKit.h>
-/******************************************************************/
- /* Support both ARC and non-ARC */
-
+/**************** Support both ARC and non-ARC ********************/
#ifndef SUPPORT_ARC
#define SUPPORT_ARC
View
@@ -491,7 +491,7 @@ - (void)showAtPoint:(CGPoint)point inView:(UIView *)view withContentView:(UIView
// animate into full size
// First stage animates to 1.05x normal size, then second stage animates back down to 1x size.
// This two-stage animation creates a little "pop" on open.
- [UIView animateWithDuration:0.2f delay:0.f options:UIViewAnimationCurveEaseInOut animations:^{
+ [UIView animateWithDuration:0.2f delay:0.f options:UIViewAnimationOptionCurveEaseInOut animations:^{
self.alpha = 1.f;
self.transform = CGAffineTransformMakeScale(1.05f, 1.05f);
} completion:^(BOOL finished) {
@@ -509,7 +509,7 @@ - (void)layoutAtPoint:(CGPoint)point inView:(UIView *)view
[self setupLayout:point inView:view];
// animate back to full opacity
- [UIView animateWithDuration:0.2f delay:0.f options:UIViewAnimationCurveEaseInOut animations:^{
+ [UIView animateWithDuration:0.2f delay:0.f options:UIViewAnimationOptionCurveEaseInOut animations:^{
self.alpha = 1.f;
} completion:nil];
}
@@ -678,7 +678,7 @@ - (void)showImage:(UIImage *)image withMessage:(NSString *)msg
}
}
- [UIView animateWithDuration:0.2f delay:0.2f options:UIViewAnimationCurveEaseOut animations:^{
+ [UIView animateWithDuration:0.2f delay:0.2f options:UIViewAnimationOptionCurveEaseOut animations:^{
imageView.alpha = 1.f;
imageView.transform = CGAffineTransformIdentity;
} completion:^(BOOL finished) {
@@ -708,7 +708,7 @@ - (void)showError
}
}
- [UIView animateWithDuration:0.1f delay:0.1f options:UIViewAnimationCurveEaseOut animations:^{
+ [UIView animateWithDuration:0.1f delay:0.1f options:UIViewAnimationOptionCurveEaseOut animations:^{
imageView.alpha = 1.f;
imageView.transform = CGAffineTransformIdentity;
} completion:^(BOOL finished) {
@@ -739,7 +739,7 @@ - (void)showSuccess
}
}
- [UIView animateWithDuration:0.1f delay:0.1f options:UIViewAnimationCurveEaseOut animations:^{
+ [UIView animateWithDuration:0.1f delay:0.1f options:UIViewAnimationOptionCurveEaseOut animations:^{
imageView.alpha = 1.f;
imageView.transform = CGAffineTransformIdentity;
} completion:^(BOOL finished) {

0 comments on commit a13139b

Please sign in to comment.