From 90310adfea3c00b4f883061d26152082d928a63d Mon Sep 17 00:00:00 2001 From: "Suresh, Kamlesh" Date: Thu, 14 Feb 2019 16:01:35 -0500 Subject: [PATCH] code review --- MVMCoreUI/BaseControllers/MFViewController.m | 2 +- .../SplitViewController/MVMCoreUIDetailViewProtocol.h | 3 +++ .../SplitViewController/MVMCoreUISplitViewController.m | 6 +----- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/MVMCoreUI/BaseControllers/MFViewController.m b/MVMCoreUI/BaseControllers/MFViewController.m index 3d09e826..d2c1e7b3 100644 --- a/MVMCoreUI/BaseControllers/MFViewController.m +++ b/MVMCoreUI/BaseControllers/MFViewController.m @@ -326,7 +326,7 @@ - (BOOL)isOverridingRightButton { - if ([self.loadObject.pageJSON dict:@"supportLink"]) { + if ([self.loadObject.pageJSON dict:@"rightPanelButtonMap"]) { [[MVMCoreActionHandler sharedActionHandler] handleActionWithDictionary:[self.loadObject.pageJSON dict:@"supportLink"] additionalData:nil delegate:self]; diff --git a/MVMCoreUI/Containers/SplitViewController/MVMCoreUIDetailViewProtocol.h b/MVMCoreUI/Containers/SplitViewController/MVMCoreUIDetailViewProtocol.h index 82279d5f..0c5a865d 100644 --- a/MVMCoreUI/Containers/SplitViewController/MVMCoreUIDetailViewProtocol.h +++ b/MVMCoreUI/Containers/SplitViewController/MVMCoreUIDetailViewProtocol.h @@ -24,7 +24,10 @@ NS_ASSUME_NONNULL_BEGIN // Called when the back button is pressed. Overwrite for special functionality. - (void)backButtonPressed; +// View Controller can override this method and do custom action instead of opening the right panel - (BOOL)isOverridingRightButton; + +// View Controller can override this method and do custom action instead of opening the left panel - (BOOL)isOverridingLeftButton; @end diff --git a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m index 5c21f4d0..7dfb97e0 100644 --- a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m +++ b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m @@ -152,17 +152,14 @@ CGFloat const PanelAnimationDuration = 0.2; } if (self.mainViewLeading.constant < .1) { - // Hide the keyboard - [self.navigationController.topViewController.view endEditing:YES]; - + [viewController.view endEditing:YES]; // Show [self showLeftPanelAnimated:YES]; } else { // Hide [self hideLeftPanelIfNeededAnimated:YES]; } - }]; } @@ -191,7 +188,6 @@ CGFloat const PanelAnimationDuration = 0.2; if (self.mainViewTrailing.constant < .1) { // Hide the keyboard [viewController.view endEditing:YES]; - // Show [self showRightPanelAnimated:YES]; } else {