-
Notifications
You must be signed in to change notification settings - Fork 3
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.
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
category on UIViewController #2
Open
benski
wants to merge
4
commits into
master
Choose a base branch
from
benski/UIViewControllerCategory
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| // | ||
| // UIViewController+BAPromise.h | ||
| // BAPromise | ||
| // | ||
| // Created by Ben Allison on 4/21/16. | ||
| // Copyright © 2016 Ben Allison. All rights reserved. | ||
| // | ||
|
|
||
| #import <UIKit/UIKit.h> | ||
| #import "BAPromise.h" | ||
|
|
||
| @interface UIViewController (BAPromise) | ||
|
|
||
| -(BAPromise *)promiseDismissViewControllerAnimated:(BOOL)animated; | ||
| -(BAPromise *)promisePresentViewController:(UIViewController *)controller | ||
| animated:(BOOL)animated; | ||
| - (BAPromise<NSNumber *> *)transitionFromViewController:(UIViewController *)fromViewController | ||
| toViewController:(UIViewController *)toViewController | ||
| duration:(NSTimeInterval)duration | ||
| options:(UIViewAnimationOptions)options | ||
| animations:(void (^ __nullable)(void))animations | ||
| completion:(void (^ __nullable)(BOOL finished))completion; | ||
|
|
||
| @end | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| // | ||
| // UIViewController+BAPromise.m | ||
| // BAPromise | ||
| // | ||
| // Created by Ben Allison on 4/21/16. | ||
| // Copyright © 2016 Ben Allison. All rights reserved. | ||
| // | ||
|
|
||
| #import "UIViewController+BAPromise.h" | ||
| #import "BAPromise.h" | ||
|
|
||
| @implementation UIViewController (BAPromise) | ||
|
|
||
| -(BAPromise *)promiseDismissViewControllerAnimated:(BOOL)animated | ||
| { | ||
| BAPromiseClient *promise = BAPromiseClient.new; | ||
| if (!self.presentedViewController) { | ||
| // TODO(benski) a better error | ||
| return [BAPromiseClient rejectedPromise:[NSError errorWithDomain:@"org.benski.promise" code:0 userInfo:nil]]; | ||
| } | ||
|
|
||
| [self dismissViewControllerAnimated:animated completion:^{ | ||
| [promise fulfill]; | ||
| }]; | ||
| return promise; | ||
| } | ||
|
|
||
| -(BAPromise *)promisePresentViewController:(UIViewController *)controller | ||
| animated:(BOOL)animated | ||
| { | ||
| BAPromiseClient *promise = BAPromiseClient.new; | ||
| [self presentViewController:controller animated:YES completion:^{ | ||
| [promise fulfill]; | ||
| }]; | ||
| return promise; | ||
| } | ||
|
|
||
| - (BAPromise<NSNumber *> *)promiseTransitionFromViewController:(UIViewController *)fromViewController | ||
| toViewController:(UIViewController *)toViewController | ||
| duration:(NSTimeInterval)duration | ||
| options:(UIViewAnimationOptions)options animations:(void (^ __nullable)(void))animations | ||
| completion:(void (^ __nullable)(BOOL finished))completion | ||
| { | ||
| BAPromiseClient *promise = BAPromiseClient.new; | ||
| [self transitionFromViewController:fromViewController | ||
| toViewController:toViewController | ||
| duration:duration | ||
| options:options | ||
| animations:animations | ||
| completion:^(BOOL finished) { | ||
| [promise fulfillWithObject:@(finished)]; | ||
| }]; | ||
| return promise; | ||
| } | ||
|
|
||
| @end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| // | ||
| // UIViewController+BAPromiseTests.m | ||
| // BAPromise | ||
| // | ||
| // Created by Ben Allison on 4/21/16. | ||
| // Copyright © 2016 Ben Allison. All rights reserved. | ||
| // | ||
|
|
||
| #import <XCTest/XCTest.h> | ||
| #import "UIViewController+BAPromise.h" | ||
|
|
||
| @interface UIViewController_BAPromiseTests : XCTestCase | ||
|
|
||
| @end | ||
|
|
||
| @implementation UIViewController_BAPromiseTests | ||
|
|
||
| - (void)setUp { | ||
| [super setUp]; | ||
| // Put setup code here. This method is called before the invocation of each test method in the class. | ||
| } | ||
|
|
||
| - (void)tearDown { | ||
| // Put teardown code here. This method is called after the invocation of each test method in the class. | ||
| [super tearDown]; | ||
| } | ||
|
|
||
| - (void)testPresentAnimated { | ||
|
|
||
| UIViewController *vc = UIViewController.new; | ||
| UIViewController *present = UIViewController.new; | ||
| UIApplication.sharedApplication.keyWindow.rootViewController = vc; | ||
| XCTestExpectation *expectation = [self expectationWithDescription:@"Promise should fulfill"]; | ||
|
|
||
| [[vc promisePresentViewController:present animated:YES] done:^(id obj) { | ||
| [expectation fulfill]; | ||
| }]; | ||
| [self waitForExpectationsWithTimeout:1.0 handler:nil]; | ||
| } | ||
|
|
||
| - (void)testPresentNonAnimated { | ||
|
|
||
| UIViewController *vc = UIViewController.new; | ||
| UIViewController *present = UIViewController.new; | ||
| UIApplication.sharedApplication.keyWindow.rootViewController = vc; | ||
| XCTestExpectation *expectation = [self expectationWithDescription:@"Promise should fulfill"]; | ||
|
|
||
| [[vc promisePresentViewController:present animated:NO] done:^(id obj) { | ||
| [expectation fulfill]; | ||
| }]; | ||
| [self waitForExpectationsWithTimeout:1.0 handler:nil]; | ||
| } | ||
|
|
||
| - (void)testDismiss { | ||
|
|
||
| UIViewController *vc = UIViewController.new; | ||
| UIViewController *present = UIViewController.new; | ||
| UIApplication.sharedApplication.keyWindow.rootViewController = vc; | ||
| XCTestExpectation *expectation = [self expectationWithDescription:@"Promise should fulfill"]; | ||
|
|
||
| [[[vc promisePresentViewController:present animated:YES] then:^(id obj) { | ||
| return [vc promiseDismissViewControllerAnimated:YES]; | ||
| }] done:^(id obj) { | ||
| [expectation fulfill]; | ||
| }]; | ||
| [self waitForExpectationsWithTimeout:4.0 handler:nil]; | ||
| } | ||
|
|
||
| @end |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
YES
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
hah!
oh it would help if i added the methods to the interface file