Skip to content

Added support to present a view from ViewControllers #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Added support to present a view from ViewControllers #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bf72ae0
Added support to present a view from ViewControllers
Sep 3, 2013
7c626dd
Added drop down animations
Sep 5, 2013
1d0b7e4
Fixed presentView from a Modal ViewController
Sep 6, 2013
b8da33b
Added isPresenting method
Sep 30, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions ASDepthModal/ASDepthModalViewController.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@ typedef NS_OPTIONS(NSUInteger, ASDepthModalOptions) {
ASDepthModalOptionAnimationGrow = 0 << 0, //default
ASDepthModalOptionAnimationShrink = 1 << 0,
ASDepthModalOptionAnimationNone = 2 << 0,
ASDepthModalOptionAnimationDropDown = 3 << 0,

ASDepthModalOptionAnimationCloseShrink = 0 << 4,
ASDepthModalOptionAnimationCloseDropDown = 1 << 4,

ASDepthModalOptionBlur = 0 << 8, // default
ASDepthModalOptionBlurNone = 1 << 8,
ASDepthModalOptionTapOutsideToClose = 0 << 9, // default
Expand All @@ -41,8 +46,13 @@ Mostly inspired by http://lab.hakim.se/avgrund/
*/
@interface ASDepthModalViewController : UIViewController <UIGestureRecognizerDelegate>

+ (void)presentViewController:(UIViewController *)viewController backgroundColor:(UIColor *)color options:(ASDepthModalOptions)options completionHandler:(void(^)())handler;
+ (void)presentViewController:(UIViewController *)viewController;

+ (void)presentView:(UIView *)view backgroundColor:(UIColor *)color options:(ASDepthModalOptions)options completionHandler:(void(^)())handler;
+ (void)presentView:(UIView *)view;

+ (BOOL)isPresenting;
+ (void)dismiss;

@end
111 changes: 93 additions & 18 deletions ASDepthModal/ASDepthModalViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,19 @@
static CGFloat const kDefaultiPadCornerRadius = 6;

static NSInteger const kDepthModalOptionAnimationMask = 3 << 0;
static NSInteger const kDepthModalOptionAnimationCloseMask = 3 << 4;
static NSInteger const kDepthModalOptionBlurMask = 1 << 8;
static NSInteger const kDepthModalOptionTapMask = 1 << 9;

@interface ASDepthModalViewController ()
@property (nonatomic, strong) UIViewController *viewProvider;
@property (nonatomic, strong) UIViewController *rootViewController;
@property (nonatomic, strong) UIView *coverView;
@property (nonatomic, strong) UIView *popupView;
@property (nonatomic, assign) CGAffineTransform initialPopupTransform;
@property (nonatomic, strong) UIImageView *blurView;
@property (nonatomic, strong) void(^completionHandler)();
@property (nonatomic) ASDepthModalOptions options;
@end

@implementation ASDepthModalViewController
Expand Down Expand Up @@ -72,25 +75,60 @@ - (void)restoreRootViewController

- (void)dismiss
{
[UIView animateWithDuration:kModalViewAnimationDuration
animations:^{
self.coverView.alpha = 0;
self.rootViewController.view.transform = CGAffineTransformIdentity;
self.popupView.transform = self.initialPopupTransform;
self.blurView.alpha = 0;
}
completion:^(BOOL finished) {
[self.rootViewController.view.layer setMasksToBounds:NO];
[self.blurView removeFromSuperview];
[self restoreRootViewController];
self.rootViewController.view.layer.cornerRadius = 0;

if (self.completionHandler) {
self.completionHandler();
}
}];
NSInteger style = (self.options & kDepthModalOptionAnimationCloseMask);

void (^completion)(BOOL) = ^void (BOOL finished){
[self.rootViewController.view.layer setMasksToBounds:NO];
[self.blurView removeFromSuperview];
[self restoreRootViewController];
self.rootViewController.view.layer.cornerRadius = 0;

if (self.completionHandler) {
self.completionHandler();
}

};

switch (style) {
case ASDepthModalOptionAnimationCloseDropDown:
{
CGPoint point = self.popupView.center;
point.y += self.view.bounds.size.height;
[UIView animateWithDuration:0.3
delay:0
options:UIViewAnimationOptionCurveEaseIn
animations:^{
self.popupView.center = point;
CGFloat angle = ((CGFloat)arc4random_uniform(100) - 50.f) / 100.f;
self.popupView.transform = CGAffineTransformMakeRotation(angle);

self.coverView.alpha = 0;
self.rootViewController.view.transform = CGAffineTransformIdentity;
// self.popupView.transform = self.initialPopupTransform;
self.blurView.alpha = 0;
}
completion:completion];
}
break;
default:
case ASDepthModalOptionAnimationCloseShrink:
{
[UIView animateWithDuration:kModalViewAnimationDuration
animations:^{
self.coverView.alpha = 0;
self.rootViewController.view.transform = CGAffineTransformIdentity;
self.popupView.transform = self.initialPopupTransform;
self.blurView.alpha = 0;
}
completion:completion];
}
break;
}

}



- (void)animatePopupWithStyle:(ASDepthModalOptions)options
{
NSInteger style = (options & kDepthModalOptionAnimationMask);
Expand All @@ -117,7 +155,17 @@ - (void)animatePopupWithStyle:(ASDepthModalOptions)options
}];
}
break;

case ASDepthModalOptionAnimationDropDown:
{
CGFloat y = self.popupView.center.y;
CAKeyframeAnimation *animation = [CAKeyframeAnimation animationWithKeyPath:@"position.y"];
animation.values = @[@(y - self.view.bounds.size.height), @(y + 20), @(y - 10), @(y)];
animation.keyTimes = @[@(0), @(0.5), @(0.75), @(1)];
animation.timingFunctions = @[[CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseOut], [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionLinear], [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseOut]];
animation.duration = 0.4;
[self.popupView.layer addAnimation:animation forKey:@"dropdown"];
}
break;
default:
self.initialPopupTransform = self.popupView.transform;
break;
Expand All @@ -134,6 +182,7 @@ - (void)presentView:(UIView *)view withBackgroundColor:(UIColor *)color options:
self.view.backgroundColor = color;
}
self.completionHandler = handler;
self.options = options;

window = [UIApplication sharedApplication].keyWindow;
self.rootViewController = window.rootViewController;
Expand Down Expand Up @@ -243,6 +292,20 @@ - (void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)interf
self.rootViewController.view.transform = CGAffineTransformMakeScale(0.9, 0.9);
}

+ (void)presentViewController:(UIViewController *)viewController backgroundColor:(UIColor *)color options:(ASDepthModalOptions)options completionHandler:(void(^)())handler
{
ASDepthModalViewController *modalViewController = [[ASDepthModalViewController alloc] init];
modalViewController.viewProvider = viewController;


[modalViewController presentView:viewController.view withBackgroundColor:(UIColor *)color options:options completionHandler:handler];
}

+ (void)presentViewController:(UIViewController *)viewController
{
[self presentViewController:viewController backgroundColor:nil options:0 completionHandler:nil];
}

+ (void)presentView:(UIView *)view
{
[self presentView:view backgroundColor:nil options:0 completionHandler:nil];
Expand Down Expand Up @@ -275,6 +338,18 @@ + (NSInteger)optionsWithStyle:(ASDepthModalOptions)style blur:(BOOL)blur tapOuts
return options;
}

+ (BOOL)isPresenting
{
UIWindow *window;

window = [UIApplication sharedApplication].keyWindow;
if([window.rootViewController isKindOfClass:[ASDepthModalViewController class]])
{
return YES;
}
return NO;
}

+ (void)dismiss
{
UIWindow *window;
Expand Down
9 changes: 7 additions & 2 deletions Example/ASDepthModalExample/ASMainViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ @implementation ASMainViewController
- (void)setupConfigurations
{
self.configurationColors = [NSArray arrayWithObjects:@"black (default)", @"pattern", nil];
self.configurationStyles = [NSArray arrayWithObjects:@"grow (default)", @"shrink", @"none", nil];
self.configurationStyles = [NSArray arrayWithObjects:@"grow (default)", @"shrink", @"none",@"dropDown", nil];
}

- (void)viewDidLoad
Expand Down Expand Up @@ -75,15 +75,20 @@ - (IBAction)showModalViewAction:(id)sender
{
style = ASDepthModalOptionAnimationNone;
}
else if(styleConfigurationIndex == 3)
{
style = ASDepthModalOptionAnimationDropDown;
}

options = style | (self.blurSwitch.on?ASDepthModalOptionBlur:ASDepthModalOptionBlurNone) | (self.tapOutsideSwitch.on?ASDepthModalOptionTapOutsideToClose:ASDepthModalOptionTapOutsideInactive);
options = style | ASDepthModalOptionAnimationCloseDropDown | (self.blurSwitch.on?ASDepthModalOptionBlur:ASDepthModalOptionBlurNone) | (self.tapOutsideSwitch.on?ASDepthModalOptionTapOutsideToClose:ASDepthModalOptionTapOutsideInactive);

[ASDepthModalViewController presentView:self.popupView
backgroundColor:color
options:options
completionHandler:^{
NSLog(@"Modal view closed.");
}];

}

- (IBAction)closePopupAction:(id)sender
Expand Down