From 8a73be75e1256ea4669bb3a4a4a88dd940b98428 Mon Sep 17 00:00:00 2001 From: "Suresh, Kamlesh" Date: Thu, 14 Feb 2019 14:58:44 -0500 Subject: [PATCH] code review --- MVMCoreUI/BaseControllers/MFViewController.m | 15 ++++++++------- .../MVMCoreUIDetailViewProtocol.h | 2 -- .../MVMCoreUISplitViewController.m | 18 +++++------------- 3 files changed, 13 insertions(+), 22 deletions(-) diff --git a/MVMCoreUI/BaseControllers/MFViewController.m b/MVMCoreUI/BaseControllers/MFViewController.m index fea8aeb9..3d09e826 100644 --- a/MVMCoreUI/BaseControllers/MFViewController.m +++ b/MVMCoreUI/BaseControllers/MFViewController.m @@ -326,13 +326,14 @@ - (BOOL)isOverridingRightButton { - return [self.loadObject.pageJSON dict:@"supportLink"]; -} - -- (void)rightPanelButtonPressed { - [[MVMCoreActionHandler sharedActionHandler] handleActionWithDictionary:[self.loadObject.pageJSON dict:@"supportLink"] - additionalData:nil - delegate:self]; + if ([self.loadObject.pageJSON dict:@"supportLink"]) { + [[MVMCoreActionHandler sharedActionHandler] handleActionWithDictionary:[self.loadObject.pageJSON dict:@"supportLink"] + additionalData:nil + delegate:self]; + return YES; + } else { + return NO; + } } - (void)setSupportShouldBeAccessible:(BOOL)supportShouldBeAccessible { diff --git a/MVMCoreUI/Containers/SplitViewController/MVMCoreUIDetailViewProtocol.h b/MVMCoreUI/Containers/SplitViewController/MVMCoreUIDetailViewProtocol.h index 4d8657e9..82279d5f 100644 --- a/MVMCoreUI/Containers/SplitViewController/MVMCoreUIDetailViewProtocol.h +++ b/MVMCoreUI/Containers/SplitViewController/MVMCoreUIDetailViewProtocol.h @@ -24,8 +24,6 @@ NS_ASSUME_NONNULL_BEGIN // Called when the back button is pressed. Overwrite for special functionality. - (void)backButtonPressed; -- (void)leftPanelButtonPressed; -- (void)rightPanelButtonPressed; - (BOOL)isOverridingRightButton; - (BOOL)isOverridingLeftButton; diff --git a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m index 302d2ca0..e9b7c94a 100644 --- a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m +++ b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m @@ -146,13 +146,9 @@ CGFloat const PanelAnimationDuration = 0.2; // If Viewcontroller confirms to protocol and implements the the method leftPanelButtonPressed if ([viewController conformsToProtocol:@protocol(MVMCoreUIDetailViewProtocol)] - && [viewController respondsToSelector:@selector(leftPanelButtonPressed)] - && [viewController respondsToSelector:@selector(isOverridingLeftButton)]) { - - if ([((UIViewController *)viewController) isOverridingLeftButton]) { - [((UIViewController *)viewController) leftPanelButtonPressed]; - return; - } + && [viewController respondsToSelector:@selector(isOverridingLeftButton)] + && [((UIViewController *)viewController) leftPanelButtonPressed]) { + return; } if (self.mainViewLeading.constant < .1) { @@ -188,12 +184,8 @@ CGFloat const PanelAnimationDuration = 0.2; // If Viewcontroller confirms to protocol and implements the the method rightPanelButtonPressed if ([viewController conformsToProtocol:@protocol(MVMCoreUIDetailViewProtocol)] && [viewController respondsToSelector:@selector(isOverridingRightButton)] - && [viewController respondsToSelector:@selector(rightPanelButtonPressed)]) { - - if ([((UIViewController *)viewController) isOverridingRightButton]) { - [((UIViewController *)viewController) rightPanelButtonPressed]; - return; - } + && [((UIViewController *)viewController) isOverridingRightButton]) { + return; } if (self.mainViewTrailing.constant < .1) {