33// AMWaveTransitioning
44//
55// Created by Andrea on 11/04/14.
6- // Copyright (c) 2014 Fancy Pixel. All rights reserved.
6+ // Copyright (c) 2015 Fancy Pixel. All rights reserved.
77//
88
99#import " AMWaveTransition.h"
@@ -53,23 +53,19 @@ - (instancetype)init {
5353 return self;
5454}
5555
56- + (instancetype )transitionWithOperation : (UINavigationControllerOperation)operation
57- {
56+ + (instancetype )transitionWithOperation : (UINavigationControllerOperation)operation {
5857 return [[self alloc ] initWithOperation: operation andTransitionType: AMWaveTransitionTypeNervous];
5958}
6059
61- - (instancetype )initWithOperation : (UINavigationControllerOperation)operation
62- {
60+ - (instancetype )initWithOperation : (UINavigationControllerOperation)operation {
6361 return [self initWithOperation: operation andTransitionType: AMWaveTransitionTypeNervous];
6462}
6563
66- + (instancetype )transitionWithOperation : (UINavigationControllerOperation)operation andTransitionType : (AMWaveTransitionType)type
67- {
64+ + (instancetype )transitionWithOperation : (UINavigationControllerOperation)operation andTransitionType : (AMWaveTransitionType)type {
6865 return [[self alloc ] initWithOperation: operation andTransitionType: type];
6966}
7067
71- - (instancetype )initWithOperation : (UINavigationControllerOperation)operation andTransitionType : (AMWaveTransitionType)type
72- {
68+ - (instancetype )initWithOperation : (UINavigationControllerOperation)operation andTransitionType : (AMWaveTransitionType)type {
7369 self = [super init ];
7470 if (self) {
7571 [self setup ];
@@ -79,17 +75,15 @@ - (instancetype)initWithOperation:(UINavigationControllerOperation)operation and
7975 return self;
8076}
8177
82- - (void )setup
83- {
78+ - (void )setup {
8479 _viewControllersInset = 20 ;
8580 _interactiveTransitionType = AMWaveTransitionEdgePan;
8681 _animateAlphaWithInteractiveTransition = NO ;
8782 _duration = DURATION;
8883 _maxDelay = MAX_DELAY;
8984}
9085
91- - (void )attachInteractiveGestureToNavigationController : (UINavigationController *)navigationController
92- {
86+ - (void )attachInteractiveGestureToNavigationController : (UINavigationController *)navigationController {
9387 self.navigationController = navigationController;
9488 if (self.interactiveTransitionType == AMWaveTransitionEdgePan) {
9589 UIScreenEdgePanGestureRecognizer *recognizer = [[UIScreenEdgePanGestureRecognizer alloc ] initWithTarget: self
@@ -107,8 +101,7 @@ - (void)attachInteractiveGestureToNavigationController:(UINavigationController *
107101 self.attachmentsTo = [@[] mutableCopy ];
108102}
109103
110- - (void )detachInteractiveGesture
111- {
104+ - (void )detachInteractiveGesture {
112105 UINavigationController *navigationController = self.navigationController ;
113106 [navigationController.view removeGestureRecognizer: self .gesture];
114107 self.navigationController = nil ;
@@ -117,8 +110,7 @@ - (void)detachInteractiveGesture
117110 self.animator = nil ;
118111}
119112
120- - (void )handlePan : (UIScreenEdgePanGestureRecognizer *)gesture
121- {
113+ - (void )handlePan : (UIScreenEdgePanGestureRecognizer *)gesture {
122114 UINavigationController *navigationController = self.navigationController ; // support CLANG_WARN_OBJC_RECEIVER_WEAK
123115
124116 // Starting controller
@@ -239,8 +231,7 @@ - (void)handlePan:(UIScreenEdgePanGestureRecognizer *)gesture
239231 }
240232}
241233
242- - (void )animationCompletionForInteractiveTransitionForView : (UIView *)view
243- {
234+ - (void )animationCompletionForInteractiveTransitionForView : (UIView *)view {
244235 CGRect rect = view.frame ;
245236 rect.origin .x = 0 ;
246237 UINavigationController *navigationController = self.navigationController ;
@@ -253,17 +244,14 @@ - (void)animationCompletionForInteractiveTransitionForView:(UIView *)view
253244 view.alpha = [self alphaForView: view];
254245}
255246
256-
257- - (void )setPresentedFrameForView : (UIView *)view
258- {
247+ - (void )setPresentedFrameForView : (UIView *)view {
259248 CGRect rect = view.frame ;
260249 rect.origin .x = 0 ;
261250 view.frame = rect;
262251 view.alpha = [self alphaForView: view];
263252}
264253
265- - (void )kickCellOutside : (UIView *)view
266- {
254+ - (void )kickCellOutside : (UIView *)view {
267255 CGRect rect = view.frame ;
268256 rect.origin .x = -SCREEN_WIDTH - self.viewControllersInset ;
269257 UINavigationController *navigationController = self.navigationController ;
@@ -276,18 +264,15 @@ - (void)kickCellOutside:(UIView *)view
276264 view.frame = rect;
277265}
278266
279- - (void )completeToVC : (UIView *)view
280- {
267+ - (void )completeToVC : (UIView *)view {
281268 [self completeTransitionWithView: view inVC: AMWaveTransitionToVC];
282269}
283270
284- - (void )completeFromVC : (UIView *)view
285- {
271+ - (void )completeFromVC : (UIView *)view {
286272 [self completeTransitionWithView: view inVC: AMWaveTransitionFromVC];
287273}
288274
289- - (void )completeTransitionWithView : (UIView *)view inVC : (AMWaveTransitionViewControllers)viewController
290- {
275+ - (void )completeTransitionWithView : (UIView *)view inVC : (AMWaveTransitionViewControllers)viewController {
291276 CGRect rect = view.frame ;
292277 if (viewController == AMWaveTransitionFromVC) {
293278 rect.origin .x = SCREEN_WIDTH - self.viewControllersInset ;
@@ -302,8 +287,7 @@ - (void)changeAttachmentWithIndex:(NSUInteger)index
302287 inView : (UIView *)view
303288 touchX : (CGFloat)touchX
304289 velocity : (CGFloat)velocity
305- inVC : (AMWaveTransitionViewControllers)viewController
306- {
290+ inVC : (AMWaveTransitionViewControllers)viewController {
307291 int selectionIndex;
308292 NSInteger correction = 2 ;
309293 NSMutableArray *arrayWithAttachments;
@@ -328,8 +312,7 @@ - (void)changeAttachmentWithIndex:(NSUInteger)index
328312 [arrayWithAttachments[index] setAnchorPoint: (CGPoint){delta, [view.superview convertPoint: view.frame.origin toView: nil ].y + view.frame .size .height / 2 }];
329313}
330314
331- - (void )createAttachmentForView : (UIView *)view inVC : (AMWaveTransitionViewControllers)viewController
332- {
315+ - (void )createAttachmentForView : (UIView *)view inVC : (AMWaveTransitionViewControllers)viewController {
333316 UIAttachmentBehavior *attachment = [[UIAttachmentBehavior alloc ] initWithItem: view attachedToAnchor: (CGPoint){0 , [view.superview convertPoint: view.frame.origin toView: nil ].y + view.frame .size .height / 2 }];
334317 [attachment setDamping: 0.4 ];
335318 [attachment setFrequency: 1 ];
@@ -346,8 +329,7 @@ - (void)createAttachmentForView:(UIView *)view inVC:(AMWaveTransitionViewControl
346329 [arrayWithAttachments addObject: attachment];
347330}
348331
349- - (CGFloat)alphaForView : (UIView *)view
350- {
332+ - (CGFloat)alphaForView : (UIView *)view {
351333 if (self.animateAlphaWithInteractiveTransition ) {
352334 CGFloat width = SCREEN_WIDTH - self.viewControllersInset ;
353335 CGFloat alpha = (width - fabs (view.frame .origin .x )) * (1 / width);
@@ -359,13 +341,11 @@ - (CGFloat)alphaForView:(UIView *)view
359341
360342#pragma mark - Non interactive transition
361343
362- - (NSTimeInterval )transitionDuration : (id <UIViewControllerContextTransitioning>)transitionContext
363- {
344+ - (NSTimeInterval )transitionDuration : (id <UIViewControllerContextTransitioning>)transitionContext {
364345 return self.duration + self.maxDelay ;
365346}
366347
367- - (void )animateTransition : (id <UIViewControllerContextTransitioning>)transitionContext
368- {
348+ - (void )animateTransition : (id <UIViewControllerContextTransitioning>)transitionContext {
369349 UIViewController *fromVC;
370350 if ([[transitionContext viewControllerForKey: UITransitionContextFromViewControllerKey] isKindOfClass: [UINavigationController class ]]) {
371351 fromVC = (UIViewController*)([(UINavigationController*)[transitionContext viewControllerForKey: UITransitionContextFromViewControllerKey] visibleViewController ]);
@@ -465,8 +445,7 @@ - (void)animateTransition:(id <UIViewControllerContextTransitioning>)transitionC
465445 }];
466446}
467447
468- - (NSArray *)visibleCellsForViewController : (UIViewController*)viewController
469- {
448+ - (NSArray *)visibleCellsForViewController : (UIViewController*)viewController {
470449 NSArray *visibleCells = nil ;
471450
472451 if ([viewController respondsToSelector: @selector (visibleCells )]) {
0 commit comments