Skip to content
This repository has been archived by the owner on Apr 20, 2023. It is now read-only.

Commit

Permalink
Merge remote-tracking branch 'dchohfi/master'
Browse files Browse the repository at this point in the history
Conflicts:
	RNBlurModalView.h
  • Loading branch information
rnystrom committed Jun 27, 2013
2 parents 213b291 + ad732aa commit 5918ecc
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
5 changes: 4 additions & 1 deletion RNBlurModalExample/RNViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,10 @@ - (IBAction)onDemoButton:(id)sender {
modal = [[RNBlurModalView alloc] initWithView:view];
}
else {
modal = [[RNBlurModalView alloc] initWithTitle:@"Hello world!" message:@"This is the default modal for RNBlurModalView. Feel free to pass any UIView to it as you wish!"];
modal = [[RNBlurModalView alloc] initWithTitle:@"Hello world! Hello world! Hello world! Hello world! Hello world! Hello world! Hello world!" message:@"This is the default modal for RNBlurModalView. Feel free to pass any UIView to it as you wish!"];
modal.defaultHideBlock = ^{
NSLog(@"Code called after the modal view is hidden");
};
}
// modal.dismissButtonRight = YES;
[modal show];
Expand Down
1 change: 1 addition & 0 deletions RNBlurModalView.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ extern NSString * const kRNBlurDidHidewNotification;
@property (assign) CGFloat animationDelay;
@property (assign) UIViewAnimationOptions animationOptions;
@property (assign) BOOL dismissButtonRight;
@property (nonatomic, copy) void (^defaultHideBlock)(void);

- (id)initWithViewController:(UIViewController*)viewController view:(UIView*)view;
- (id)initWithViewController:(UIViewController*)viewController title:(NSString*)title message:(NSString*)message;
Expand Down
3 changes: 2 additions & 1 deletion RNBlurModalView.m
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ + (UIView*)generateModalViewWithTitle:(NSString*)title message:(NSString*)messag
titleLabel.textAlignment = NSTextAlignmentCenter;
titleLabel.backgroundColor = [UIColor clearColor];
[titleLabel autoHeight];
titleLabel.numberOfLines = 0;
titleLabel.top = padding;
[view addSubview:titleLabel];

Expand Down Expand Up @@ -349,7 +350,7 @@ - (void)delayedShow {


- (void)hide {
[self hideWithDuration:kRNBlurDefaultDuration delay:0 options:kNilOptions completion:NULL];
[self hideWithDuration:kRNBlurDefaultDuration delay:0 options:kNilOptions completion:self.defaultHideBlock];
}


Expand Down

0 comments on commit 5918ecc

Please sign in to comment.