Skip to content

Commit 6d6396b

Browse files
authored
Merge pull request #4 from capnslipp/capnslipp-swift-nullability
Added `NS_ASSUME_NONNULL_…` & `nullable` for Swift
2 parents 965dab9 + 2f46661 commit 6d6396b

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

GRKContainerViewController/GRKContainerViewController.h

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,14 @@ extern NSTimeInterval const kDefaultAnimationDuration;
2626
/// @name GRKContainerViewController
2727
///
2828

29+
NS_ASSUME_NONNULL_BEGIN
30+
2931
@interface GRKContainerViewController : UIViewController
3032

3133
/**
3234
* The current view controller. Changes to this property will not be animated.
3335
*/
34-
@property (nonatomic,strong) UIViewController *viewController;
36+
@property (nonatomic,strong,nullable) UIViewController *viewController;
3537

3638
/**
3739
* The animation duration to use for the transition animation (if applicable). Defaults to `kDefaultAnimationDuration`.
@@ -46,6 +48,8 @@ extern NSTimeInterval const kDefaultAnimationDuration;
4648
* @param animated If YES then a simple cross fade animation will be applied during the tranistion from the current view controller to the new view controller.
4749
* @param completion A block to be called once the new view controller is displayed (after any animations). This can be `nil`.
4850
*/
49-
- (void)setViewController:(UIViewController *)viewController animated:(BOOL)animated completion:(void(^)(UIViewController *viewController))completion;
51+
- (void)setViewController:(UIViewController *)viewController animated:(BOOL)animated completion:(void(^_Nullable)(UIViewController *viewController))completion;
5052

5153
@end
54+
55+
NS_ASSUME_NONNULL_END

0 commit comments

Comments
 (0)