Skip to content

Commit e175e77

Browse files
romaonthegoromaonthego
committed
Rename private methods
1 parent 69a3c9e commit e175e77

File tree

1 file changed

+52
-52
lines changed

1 file changed

+52
-52
lines changed

‎RESideMenu/RESideMenu.m‎

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ - (id)init
5050
{
5151
self = [super init];
5252
if (self) {
53-
[self __commonInit];
53+
[self commonInit];
5454
}
5555
return self;
5656
}
@@ -59,12 +59,12 @@ - (id)initWithCoder:(NSCoder *)decoder
5959
{
6060
self = [super initWithCoder:decoder];
6161
if (self) {
62-
[self __commonInit];
62+
[self commonInit];
6363
}
6464
return self;
6565
}
6666

67-
- (void)__commonInit
67+
- (void)commonInit
6868
{
6969
_menuViewContainer = [[UIView alloc] init];
7070
_contentViewContainer = [[UIView alloc] init];
@@ -117,19 +117,19 @@ - (id)initWithContentViewController:(UIViewController *)contentViewController le
117117

118118
- (void)presentLeftMenuViewController
119119
{
120-
[self __presentMenuViewContainerWithMenuViewController:self.leftMenuViewController];
121-
[self __showLeftMenuViewController];
120+
[self presentMenuViewContainerWithMenuViewController:self.leftMenuViewController];
121+
[self showLeftMenuViewController];
122122
}
123123

124124
- (void)presentRightMenuViewController
125125
{
126-
[self __presentMenuViewContainerWithMenuViewController:self.rightMenuViewController];
127-
[self __showRightMenuViewController];
126+
[self presentMenuViewContainerWithMenuViewController:self.rightMenuViewController];
127+
[self showRightMenuViewController];
128128
}
129129

130130
- (void)hideMenuViewController
131131
{
132-
[self __hideMenuViewControllerAnimated:YES];
132+
[self hideMenuViewControllerAnimated:YES];
133133
}
134134

135135
- (void)setContentViewController:(UIViewController *)contentViewController animated:(BOOL)animated
@@ -149,15 +149,15 @@ - (void)setContentViewController:(UIViewController *)contentViewController anima
149149
[UIView animateWithDuration:self.animationDuration animations:^{
150150
contentViewController.view.alpha = 1;
151151
} completion:^(BOOL finished) {
152-
[self __hideViewController:self.contentViewController];
152+
[self hideViewController:self.contentViewController];
153153
[contentViewController didMoveToParentViewController:self];
154154
_contentViewController = contentViewController;
155155

156-
[self __statusBarNeedsAppearanceUpdate];
157-
[self __updateContentViewShadow];
156+
[self statusBarNeedsAppearanceUpdate];
157+
[self updateContentViewShadow];
158158

159159
if (self.visible) {
160-
[self __addContentViewControllerMotionEffects];
160+
[self addContentViewControllerMotionEffects];
161161
}
162162
}];
163163
}
@@ -218,22 +218,22 @@ - (void)viewDidLoad
218218
if (self.scaleBackgroundImageView)
219219
self.backgroundImageView.transform = CGAffineTransformMakeScale(1.7f, 1.7f);
220220

221-
[self __addMenuViewControllerMotionEffects];
221+
[self addMenuViewControllerMotionEffects];
222222

223223
if (self.panGestureEnabled) {
224224
self.view.multipleTouchEnabled = NO;
225-
UIPanGestureRecognizer *panGestureRecognizer = [[UIPanGestureRecognizer alloc] initWithTarget:self action:@selector(__panGestureRecognized:)];
225+
UIPanGestureRecognizer *panGestureRecognizer = [[UIPanGestureRecognizer alloc] initWithTarget:self action:@selector(panGestureRecognized:)];
226226
panGestureRecognizer.delegate = self;
227227
[self.view addGestureRecognizer:panGestureRecognizer];
228228
}
229229

230-
[self __updateContentViewShadow];
230+
[self updateContentViewShadow];
231231
}
232232

233233
#pragma mark -
234234
#pragma mark Private methods
235235

236-
- (void)__presentMenuViewContainerWithMenuViewController:(UIViewController *)menuViewController
236+
- (void)presentMenuViewContainerWithMenuViewController:(UIViewController *)menuViewController
237237
{
238238
self.menuViewContainer.transform = CGAffineTransformIdentity;
239239
if (self.scaleBackgroundImageView) {
@@ -253,17 +253,17 @@ - (void)__presentMenuViewContainerWithMenuViewController:(UIViewController *)men
253253
}
254254
}
255255

256-
- (void)__showLeftMenuViewController
256+
- (void)showLeftMenuViewController
257257
{
258258
if (!self.leftMenuViewController) {
259259
return;
260260
}
261261
self.leftMenuViewController.view.hidden = NO;
262262
self.rightMenuViewController.view.hidden = YES;
263263
[self.view.window endEditing:YES];
264-
[self __addContentButton];
265-
[self __updateContentViewShadow];
266-
[self __resetContentViewScale];
264+
[self addContentButton];
265+
[self updateContentViewShadow];
266+
[self resetContentViewScale];
267267

268268
[UIView animateWithDuration:self.animationDuration animations:^{
269269
if (self.scaleContentView) {
@@ -284,7 +284,7 @@ - (void)__showLeftMenuViewController
284284
self.backgroundImageView.transform = CGAffineTransformIdentity;
285285

286286
} completion:^(BOOL finished) {
287-
[self __addContentViewControllerMotionEffects];
287+
[self addContentViewControllerMotionEffects];
288288

289289
if (!self.visible && [self.delegate conformsToProtocol:@protocol(RESideMenuDelegate)] && [self.delegate respondsToSelector:@selector(sideMenu:didShowMenuViewController:)]) {
290290
[self.delegate sideMenu:self didShowMenuViewController:self.leftMenuViewController];
@@ -294,20 +294,20 @@ - (void)__showLeftMenuViewController
294294
self.leftMenuVisible = YES;
295295
}];
296296

297-
[self __statusBarNeedsAppearanceUpdate];
297+
[self statusBarNeedsAppearanceUpdate];
298298
}
299299

300-
- (void)__showRightMenuViewController
300+
- (void)showRightMenuViewController
301301
{
302302
if (!self.rightMenuViewController) {
303303
return;
304304
}
305305
self.leftMenuViewController.view.hidden = YES;
306306
self.rightMenuViewController.view.hidden = NO;
307307
[self.view.window endEditing:YES];
308-
[self __addContentButton];
309-
[self __updateContentViewShadow];
310-
[self __resetContentViewScale];
308+
[self addContentButton];
309+
[self updateContentViewShadow];
310+
[self resetContentViewScale];
311311

312312
[[UIApplication sharedApplication] beginIgnoringInteractionEvents];
313313
[UIView animateWithDuration:self.animationDuration animations:^{
@@ -331,20 +331,20 @@ - (void)__showRightMenuViewController
331331
self.visible = !(self.contentViewContainer.frame.size.width == self.view.bounds.size.width && self.contentViewContainer.frame.size.height == self.view.bounds.size.height && self.contentViewContainer.frame.origin.x == 0 && self.contentViewContainer.frame.origin.y == 0);
332332
self.rightMenuVisible = self.visible;
333333
[[UIApplication sharedApplication] endIgnoringInteractionEvents];
334-
[self __addContentViewControllerMotionEffects];
334+
[self addContentViewControllerMotionEffects];
335335
}];
336336

337-
[self __statusBarNeedsAppearanceUpdate];
337+
[self statusBarNeedsAppearanceUpdate];
338338
}
339339

340-
- (void)__hideViewController:(UIViewController *)viewController
340+
- (void)hideViewController:(UIViewController *)viewController
341341
{
342342
[viewController willMoveToParentViewController:nil];
343343
[viewController.view removeFromSuperview];
344344
[viewController removeFromParentViewController];
345345
}
346346

347-
- (void)__hideMenuViewControllerAnimated:(BOOL)animated
347+
- (void)hideMenuViewControllerAnimated:(BOOL)animated
348348
{
349349
BOOL rightMenuVisible = self.rightMenuVisible;
350350
if ([self.delegate conformsToProtocol:@protocol(RESideMenuDelegate)] && [self.delegate respondsToSelector:@selector(sideMenu:willHideMenuViewController:)]) {
@@ -401,10 +401,10 @@ - (void)__hideMenuViewControllerAnimated:(BOOL)animated
401401
animationBlock();
402402
completionBlock();
403403
}
404-
[self __statusBarNeedsAppearanceUpdate];
404+
[self statusBarNeedsAppearanceUpdate];
405405
}
406406

407-
- (void)__addContentButton
407+
- (void)addContentButton
408408
{
409409
if (self.contentButton.superview)
410410
return;
@@ -415,7 +415,7 @@ - (void)__addContentButton
415415
[self.contentViewContainer addSubview:self.contentButton];
416416
}
417417

418-
- (void)__statusBarNeedsAppearanceUpdate
418+
- (void)statusBarNeedsAppearanceUpdate
419419
{
420420
if ([self respondsToSelector:@selector(setNeedsStatusBarAppearanceUpdate)]) {
421421
[UIView animateWithDuration:0.3f animations:^{
@@ -424,7 +424,7 @@ - (void)__statusBarNeedsAppearanceUpdate
424424
}
425425
}
426426

427-
- (void)__updateContentViewShadow
427+
- (void)updateContentViewShadow
428428
{
429429
if (self.contentViewShadowEnabled) {
430430
CALayer *layer = self.contentViewContainer.layer;
@@ -437,7 +437,7 @@ - (void)__updateContentViewShadow
437437
}
438438
}
439439

440-
- (void)__resetContentViewScale
440+
- (void)resetContentViewScale
441441
{
442442
CGAffineTransform t = self.contentViewContainer.transform;
443443
CGFloat scale = sqrt(t.a * t.a + t.c * t.c);
@@ -450,7 +450,7 @@ - (void)__resetContentViewScale
450450
#pragma mark -
451451
#pragma mark iOS 7 Motion Effects (Private)
452452

453-
- (void)__addMenuViewControllerMotionEffects
453+
- (void)addMenuViewControllerMotionEffects
454454
{
455455
if (self.parallaxEnabled) {
456456
IF_IOS7_OR_GREATER(
@@ -471,7 +471,7 @@ - (void)__addMenuViewControllerMotionEffects
471471
}
472472
}
473473

474-
- (void)__addContentViewControllerMotionEffects
474+
- (void)addContentViewControllerMotionEffects
475475
{
476476
if (self.parallaxEnabled) {
477477
IF_IOS7_OR_GREATER(
@@ -523,7 +523,7 @@ - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceive
523523
#pragma mark -
524524
#pragma mark Pan gesture recognizer (Private)
525525

526-
- (void)__panGestureRecognized:(UIPanGestureRecognizer *)recognizer
526+
- (void)panGestureRecognized:(UIPanGestureRecognizer *)recognizer
527527
{
528528
if ([self.delegate conformsToProtocol:@protocol(RESideMenuDelegate)] && [self.delegate respondsToSelector:@selector(sideMenu:didRecognizePanGesture:)])
529529
[self.delegate sideMenu:self didRecognizePanGesture:recognizer];
@@ -535,7 +535,7 @@ - (void)__panGestureRecognized:(UIPanGestureRecognizer *)recognizer
535535
CGPoint point = [recognizer translationInView:self.view];
536536

537537
if (recognizer.state == UIGestureRecognizerStateBegan) {
538-
[self __updateContentViewShadow];
538+
[self updateContentViewShadow];
539539

540540
self.originalPoint = CGPointMake(self.contentViewContainer.center.x - CGRectGetWidth(self.contentViewContainer.bounds) / 2.0,
541541
self.contentViewContainer.center.y - CGRectGetHeight(self.contentViewContainer.bounds) / 2.0);
@@ -545,7 +545,7 @@ - (void)__panGestureRecognized:(UIPanGestureRecognizer *)recognizer
545545
self.backgroundImageView.frame = self.view.bounds;
546546
}
547547
self.menuViewContainer.frame = self.view.bounds;
548-
[self __addContentButton];
548+
[self addContentButton];
549549
[self.view.window endEditing:YES];
550550
self.didNotifyDelegate = NO;
551551
}
@@ -641,7 +641,7 @@ - (void)__panGestureRecognized:(UIPanGestureRecognizer *)recognizer
641641
self.rightMenuVisible = NO;
642642
}
643643

644-
[self __statusBarNeedsAppearanceUpdate];
644+
[self statusBarNeedsAppearanceUpdate];
645645
}
646646

647647
if (recognizer.state == UIGestureRecognizerStateEnded) {
@@ -653,21 +653,21 @@ - (void)__panGestureRecognized:(UIPanGestureRecognizer *)recognizer
653653
[self hideMenuViewController];
654654
}
655655
else if (self.contentViewContainer.frame.origin.x == 0) {
656-
[self __hideMenuViewControllerAnimated:NO];
656+
[self hideMenuViewControllerAnimated:NO];
657657
}
658658
else {
659659
if ([recognizer velocityInView:self.view].x > 0) {
660660
if (self.contentViewContainer.frame.origin.x < 0) {
661661
[self hideMenuViewController];
662662
} else {
663663
if (self.leftMenuViewController) {
664-
[self __showLeftMenuViewController];
664+
[self showLeftMenuViewController];
665665
}
666666
}
667667
} else {
668668
if (self.contentViewContainer.frame.origin.x < 20) {
669669
if (self.rightMenuViewController) {
670-
[self __showRightMenuViewController];
670+
[self showRightMenuViewController];
671671
}
672672
} else {
673673
[self hideMenuViewController];
@@ -693,18 +693,18 @@ - (void)setContentViewController:(UIViewController *)contentViewController
693693
_contentViewController = contentViewController;
694694
return;
695695
}
696-
[self __hideViewController:_contentViewController];
696+
[self hideViewController:_contentViewController];
697697
_contentViewController = contentViewController;
698698

699699
[self addChildViewController:self.contentViewController];
700700
self.contentViewController.view.frame = self.view.bounds;
701701
[self.contentViewContainer addSubview:self.contentViewController.view];
702702
[self.contentViewController didMoveToParentViewController:self];
703703

704-
[self __updateContentViewShadow];
704+
[self updateContentViewShadow];
705705

706706
if (self.visible) {
707-
[self __addContentViewControllerMotionEffects];
707+
[self addContentViewControllerMotionEffects];
708708
}
709709
}
710710

@@ -714,7 +714,7 @@ - (void)setLeftMenuViewController:(UIViewController *)leftMenuViewController
714714
_leftMenuViewController = leftMenuViewController;
715715
return;
716716
}
717-
[self __hideViewController:_leftMenuViewController];
717+
[self hideViewController:_leftMenuViewController];
718718
_leftMenuViewController = leftMenuViewController;
719719

720720
[self addChildViewController:self.leftMenuViewController];
@@ -723,7 +723,7 @@ - (void)setLeftMenuViewController:(UIViewController *)leftMenuViewController
723723
[self.menuViewContainer addSubview:self.leftMenuViewController.view];
724724
[self.leftMenuViewController didMoveToParentViewController:self];
725725

726-
[self __addMenuViewControllerMotionEffects];
726+
[self addMenuViewControllerMotionEffects];
727727
[self.view bringSubviewToFront:self.contentViewContainer];
728728
}
729729

@@ -733,7 +733,7 @@ - (void)setRightMenuViewController:(UIViewController *)rightMenuViewController
733733
_rightMenuViewController = rightMenuViewController;
734734
return;
735735
}
736-
[self __hideViewController:_rightMenuViewController];
736+
[self hideViewController:_rightMenuViewController];
737737
_rightMenuViewController = rightMenuViewController;
738738

739739
[self addChildViewController:self.rightMenuViewController];
@@ -742,7 +742,7 @@ - (void)setRightMenuViewController:(UIViewController *)rightMenuViewController
742742
[self.menuViewContainer addSubview:self.rightMenuViewController.view];
743743
[self.rightMenuViewController didMoveToParentViewController:self];
744744

745-
[self __addMenuViewControllerMotionEffects];
745+
[self addMenuViewControllerMotionEffects];
746746
[self.view bringSubviewToFront:self.contentViewContainer];
747747
}
748748

@@ -781,7 +781,7 @@ - (void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)toInte
781781
self.contentViewContainer.center = center;
782782
}
783783

784-
[self __updateContentViewShadow];
784+
[self updateContentViewShadow];
785785
}
786786

787787
#pragma mark -

0 commit comments

Comments
 (0)