From a9734be4df338fd472a474023db53385d37ee81a Mon Sep 17 00:00:00 2001 From: "Suresh, Kamlesh" Date: Thu, 18 Apr 2019 12:32:59 -0400 Subject: [PATCH 1/5] detail view controller --- .../SplitViewController/MVMCoreUISplitViewController.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m index bdfd6ecd..ff2e2964 100644 --- a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m +++ b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m @@ -142,7 +142,7 @@ CGFloat const PanelAnimationDuration = 0.2; - (IBAction)leftPanelButtonPressed:(id)sender { [MVMCoreDispatchUtility performBlockOnMainThread:^{ - UIViewController *viewController = self.navigationController.topViewController; + UIViewController *viewController = [self getCurrentDetailViewController]; // If Viewcontroller confirms to protocol and implements the the method leftPanelButtonPressed if ([viewController conformsToProtocol:@protocol(MVMCoreUIDetailViewProtocol)] @@ -176,7 +176,7 @@ CGFloat const PanelAnimationDuration = 0.2; - (IBAction)rightPanelButtonPressed:(id)sender { [MVMCoreDispatchUtility performBlockOnMainThread:^{ - UIViewController *viewController = self.navigationController.topViewController; + UIViewController *viewController = [self getCurrentDetailViewController]; // If Viewcontroller confirms to protocol and implements the the method rightPanelButtonPressed if ([viewController conformsToProtocol:@protocol(MVMCoreUIDetailViewProtocol)] From 3ec1364aed221f8ec3b4b20413720a1bd617cc36 Mon Sep 17 00:00:00 2001 From: panxi Date: Fri, 3 May 2019 15:25:41 -0400 Subject: [PATCH 2/5] let tabbar manager handle child viewcontroller's behavior --- MVMCoreUI/BaseControllers/MFViewController.m | 13 +++++++++++++ .../MVMCoreUISplitViewController.m | 4 ++-- .../MVMCoreUITabBarPageControlViewController.m | 16 ++++++++++++++++ 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/MVMCoreUI/BaseControllers/MFViewController.m b/MVMCoreUI/BaseControllers/MFViewController.m index 0c3b3f3d..5c599ca3 100644 --- a/MVMCoreUI/BaseControllers/MFViewController.m +++ b/MVMCoreUI/BaseControllers/MFViewController.m @@ -352,6 +352,19 @@ } } +- (BOOL)isOverridingLeftButton { + NSDictionary *leftPanelLinkDict = [self.loadObject.pageJSON dict:@"leftPanelButtonLink"]; + if (leftPanelLinkDict) { + [[MVMCoreActionHandler sharedActionHandler] handleActionWithDictionary:leftPanelLinkDict + additionalData:nil + delegateObject:[self delegateObject]]; + return YES; + } else { + return NO; + } +} + + - (void)setSupportShouldBeAccessible:(BOOL)supportShouldBeAccessible { MVMCoreUISplitViewController *splitViewController = [MVMCoreUISession sharedGlobal].splitViewController; diff --git a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m index ff2e2964..bdfd6ecd 100644 --- a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m +++ b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m @@ -142,7 +142,7 @@ CGFloat const PanelAnimationDuration = 0.2; - (IBAction)leftPanelButtonPressed:(id)sender { [MVMCoreDispatchUtility performBlockOnMainThread:^{ - UIViewController *viewController = [self getCurrentDetailViewController]; + UIViewController *viewController = self.navigationController.topViewController; // If Viewcontroller confirms to protocol and implements the the method leftPanelButtonPressed if ([viewController conformsToProtocol:@protocol(MVMCoreUIDetailViewProtocol)] @@ -176,7 +176,7 @@ CGFloat const PanelAnimationDuration = 0.2; - (IBAction)rightPanelButtonPressed:(id)sender { [MVMCoreDispatchUtility performBlockOnMainThread:^{ - UIViewController *viewController = [self getCurrentDetailViewController]; + UIViewController *viewController = self.navigationController.topViewController; // If Viewcontroller confirms to protocol and implements the the method rightPanelButtonPressed if ([viewController conformsToProtocol:@protocol(MVMCoreUIDetailViewProtocol)] diff --git a/MVMCoreUI/Containers/TabBarController/MVMCoreUITabBarPageControlViewController.m b/MVMCoreUI/Containers/TabBarController/MVMCoreUITabBarPageControlViewController.m index d06ca5f4..5845a06a 100644 --- a/MVMCoreUI/Containers/TabBarController/MVMCoreUITabBarPageControlViewController.m +++ b/MVMCoreUI/Containers/TabBarController/MVMCoreUITabBarPageControlViewController.m @@ -139,6 +139,22 @@ } } +- (BOOL)isOverridingLeftButton { + if ([self.viewController isKindOfClass:MFViewController.class]) { + return [(MFViewController *)self.viewController isOverridingLeftButton]; + } else { + return [super isOverridingLeftButton]; + } +} + +- (BOOL)isOverridingRightButton { + if ([self.viewController isKindOfClass:MFViewController.class]) { + return [(MFViewController *)self.viewController isOverridingRightButton]; + } else { + return [super isOverridingRightButton]; + } +} + #pragma mark - View Cycle - (void)loadView { From 524eef437936cf65fa84938291e8740f94c27640 Mon Sep 17 00:00:00 2001 From: "Suresh, Kamlesh" Date: Fri, 3 May 2019 16:47:45 -0400 Subject: [PATCH 3/5] improvements --- MVMCoreUI/Atoms/TextFields/MFTextField.m | 17 ++++-- .../FormValidator+TextFields.swift | 57 ------------------- .../MVMCoreUIDelegateObject.swift | 4 +- 3 files changed, 15 insertions(+), 63 deletions(-) diff --git a/MVMCoreUI/Atoms/TextFields/MFTextField.m b/MVMCoreUI/Atoms/TextFields/MFTextField.m index 33224f8a..52580f46 100644 --- a/MVMCoreUI/Atoms/TextFields/MFTextField.m +++ b/MVMCoreUI/Atoms/TextFields/MFTextField.m @@ -298,14 +298,11 @@ self.uiTextFieldDelegate = delegate; } -- (void)setWithMap:(nullable NSDictionary *)map bothDelegates:(nullable id)delegate { +- (void)setWithMap:(nullable NSDictionary *)map { if (map.count == 0) { return; } - [MVMCoreUICommonViewsUtility addDismissToolbar:self.textField delegate:delegate]; - [self setBothTextFieldDelegates:delegate]; - NSString *string = [map string:KeyLabel]; if (string.length > 0) { self.formText = string; @@ -351,6 +348,12 @@ } } +- (void)setWithMap:(nullable NSDictionary *)map bothDelegates:(nullable id)delegate { + [MVMCoreUICommonViewsUtility addDismissToolbar:self.textField delegate:delegate]; + [self setBothTextFieldDelegates:delegate]; + [self setWithMap:map]; +} + - (void)setValidationBlock:(BOOL (^)(NSString * _Nullable))validationBlock { _validationBlock = validationBlock; [self valueChanged]; @@ -560,7 +563,11 @@ if ([delegateObject isKindOfClass:[MVMCoreUIDelegateObject class]]) { [FormValidator setupValidationWithMolecule:self delegate:((MVMCoreUIDelegateObject *)delegateObject).formValidationProtocol]; FormValidator *formValidator = [FormValidator getFormValidatorForDelegate:((MVMCoreUIDelegateObject *)delegateObject).formValidationProtocol]; - [self setWithMap:json bothDelegates:formValidator]; + + [self setWithMap:json]; + self.mfTextFieldDelegate = formValidator; + self.uiTextFieldDelegate = ((MVMCoreUIDelegateObject *)delegateObject).uiTextFieldDelegate; + [MVMCoreUICommonViewsUtility addDismissToolbar:self.textField delegate:self.uiTextFieldDelegate]; } } diff --git a/MVMCoreUI/FormUIHelpers/FormValidator+TextFields.swift b/MVMCoreUI/FormUIHelpers/FormValidator+TextFields.swift index 2532910d..b2b18ebe 100644 --- a/MVMCoreUI/FormUIHelpers/FormValidator+TextFields.swift +++ b/MVMCoreUI/FormUIHelpers/FormValidator+TextFields.swift @@ -8,63 +8,6 @@ import Foundation -@objc extension FormValidator: UITextFieldDelegate { - public func textFieldDidEndEditing(_ textField: UITextField) { - enableByValidation() - if let delegate = delegate as? UITextFieldDelegate { - delegate.textFieldDidEndEditing?(textField) - } - } - - public func textFieldShouldReturn(_ textField: UITextField) -> Bool { - textField.resignFirstResponder() - if let delegate = delegate as? UITextFieldDelegate { - return delegate.textFieldShouldReturn?(textField) ?? true - } - return true - } - - public func textFieldDidBeginEditing(_ textField: UITextField) { - if let delegate = delegate as? UITextFieldDelegate { - delegate.textFieldDidBeginEditing?(textField) - } - } - - public func textFieldShouldBeginEditing(_ textField: UITextField) -> Bool { - if let delegate = delegate as? UITextFieldDelegate { - return delegate.textFieldShouldBeginEditing?(textField) ?? true - } - return true - } - - public func textFieldShouldEndEditing(_ textField: UITextField) -> Bool { - if let delegate = delegate as? UITextFieldDelegate { - return delegate.textFieldShouldEndEditing?(textField) ?? true - } - return true - } - - public func textFieldDidEndEditing(_ textField: UITextField, reason: UITextField.DidEndEditingReason) { - if let delegate = delegate as? UITextFieldDelegate { - delegate.textFieldDidEndEditing?(textField, reason: reason) - } - } - - public func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool { - if let delegate = delegate as? UITextFieldDelegate { - return delegate.textField?(textField, shouldChangeCharactersIn: range, replacementString: string) ?? true - } - return true - } - - public func textFieldShouldClear(_ textField: UITextField) -> Bool { - if let delegate = delegate as? UITextFieldDelegate { - return delegate.textFieldShouldClear?(textField) ?? true - } - return true - } -} - @objc extension FormValidator: MFTextFieldDelegate { public func dismissFieldInput(_ sender: Any?) { if let delegate = delegate as? MFTextFieldDelegate { diff --git a/MVMCoreUI/OtherHandlers/MVMCoreUIDelegateObject.swift b/MVMCoreUI/OtherHandlers/MVMCoreUIDelegateObject.swift index eaf892fb..92744a8c 100644 --- a/MVMCoreUI/OtherHandlers/MVMCoreUIDelegateObject.swift +++ b/MVMCoreUI/OtherHandlers/MVMCoreUIDelegateObject.swift @@ -11,10 +11,12 @@ import UIKit open class MVMCoreUIDelegateObject: DelegateObject { public weak var formValidationProtocol: FormValidationProtocol? public weak var buttonDelegate: ButtonDelegateProtocol? - + public weak var uiTextFieldDelegate: UITextFieldDelegate? + open override func setAll(withDelegate delegate: Any) { super.setAll(withDelegate: delegate) formValidationProtocol = delegate as? FormValidationProtocol buttonDelegate = delegate as? ButtonDelegateProtocol + uiTextFieldDelegate = delegate as? UITextFieldDelegate } } From f4bf4c0b5a8cf5157e4199b12f12e95a2e36c968 Mon Sep 17 00:00:00 2001 From: panxi Date: Wed, 8 May 2019 11:03:14 -0400 Subject: [PATCH 4/5] update code based on Scott's comment --- MVMCoreUI/BaseControllers/MFViewController.m | 8 ++------ .../MVMCoreUITabBarPageControlViewController.m | 8 ++++---- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/MVMCoreUI/BaseControllers/MFViewController.m b/MVMCoreUI/BaseControllers/MFViewController.m index 5c599ca3..a9206b52 100644 --- a/MVMCoreUI/BaseControllers/MFViewController.m +++ b/MVMCoreUI/BaseControllers/MFViewController.m @@ -343,9 +343,7 @@ - (BOOL)isOverridingRightButton { NSDictionary *rightPanelLinkDict = [self.loadObject.pageJSON dict:@"rightPanelButtonLink"]; if (rightPanelLinkDict) { - [[MVMCoreActionHandler sharedActionHandler] handleActionWithDictionary:rightPanelLinkDict - additionalData:nil - delegateObject:[self delegateObject]]; + [[MVMCoreActionHandler sharedActionHandler] handleActionWithDictionary:rightPanelLinkDict additionalData:nil delegateObject:[self delegateObject]]; return YES; } else { return NO; @@ -355,9 +353,7 @@ - (BOOL)isOverridingLeftButton { NSDictionary *leftPanelLinkDict = [self.loadObject.pageJSON dict:@"leftPanelButtonLink"]; if (leftPanelLinkDict) { - [[MVMCoreActionHandler sharedActionHandler] handleActionWithDictionary:leftPanelLinkDict - additionalData:nil - delegateObject:[self delegateObject]]; + [[MVMCoreActionHandler sharedActionHandler] handleActionWithDictionary:leftPanelLinkDict additionalData:nil delegateObject:[self delegateObject]]; return YES; } else { return NO; diff --git a/MVMCoreUI/Containers/TabBarController/MVMCoreUITabBarPageControlViewController.m b/MVMCoreUI/Containers/TabBarController/MVMCoreUITabBarPageControlViewController.m index 5845a06a..1d8481d6 100644 --- a/MVMCoreUI/Containers/TabBarController/MVMCoreUITabBarPageControlViewController.m +++ b/MVMCoreUI/Containers/TabBarController/MVMCoreUITabBarPageControlViewController.m @@ -140,16 +140,16 @@ } - (BOOL)isOverridingLeftButton { - if ([self.viewController isKindOfClass:MFViewController.class]) { - return [(MFViewController *)self.viewController isOverridingLeftButton]; + if ([self.viewController respondsToSelector:@selector(isOverridingLeftButton)]) { + return [self.viewController performSelector:@selector(isOverridingLeftButton)]; } else { return [super isOverridingLeftButton]; } } - (BOOL)isOverridingRightButton { - if ([self.viewController isKindOfClass:MFViewController.class]) { - return [(MFViewController *)self.viewController isOverridingRightButton]; + if ([self.viewController respondsToSelector:@selector(isOverridingRightButton)]) { + return [self.viewController performSelector:@selector(isOverridingRightButton)]; } else { return [super isOverridingRightButton]; } From b5f65b6fdfcb82256cd5d185b83d1169f831096b Mon Sep 17 00:00:00 2001 From: panxi Date: Thu, 9 May 2019 10:50:36 -0400 Subject: [PATCH 5/5] update checkbox for crash --- MVMCoreUI/Atoms/Views/MVMCoreUICheckBox.m | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/MVMCoreUI/Atoms/Views/MVMCoreUICheckBox.m b/MVMCoreUI/Atoms/Views/MVMCoreUICheckBox.m index ff46aa6a..0158beb1 100644 --- a/MVMCoreUI/Atoms/Views/MVMCoreUICheckBox.m +++ b/MVMCoreUI/Atoms/Views/MVMCoreUICheckBox.m @@ -342,8 +342,10 @@ static const CGFloat CheckBoxHeightWidth = 18.0; [self.checkMark updateCheckSelected:NO animated:animated]; } - FormValidator *formValidator = ((MVMCoreUIDelegateObject *)self.delegate).formValidationProtocol.formValidatorModel; - [formValidator enableByValidation]; + if (self.delegate && [self.delegate respondsToSelector:@selector(formValidationProtocol)] && [[self.delegate performSelector:@selector(formValidationProtocol)] respondsToSelector:@selector(formValidatorModel)]) { + FormValidator *formValidator = [[self.delegate performSelector:@selector(formValidationProtocol)] performSelector:@selector(formValidatorModel)]; + [formValidator enableByValidation]; + } } - (void)setColor:(nullable UIColor *)color forState:(UIControlState)state {