warning fix

MVMCoreUI/Atoms/Buttons/MFTextButton.m

@@ -128,12 +128,12 @@
 
 #pragma mark - MVMCoreUIMoleculeViewProtocol
 
-- (void)setWithJSON:(NSDictionary *)json delegate:(NSObject *)delegate additionalData:(NSDictionary *)additionalData {
+- (void)setWithJSON:(NSDictionary *)json delegateObject:(DelegateObject *)delegateObject additionalData:(NSDictionary *)additionalData {
     NSString *color = [json string:KeyTextColor];
     if (color) {
         [self setTitleColor:[UIColor mfGetColorForHex:color] forState:UIControlStateNormal];
     }
-    [self setWithActionMap:json actionDelegate:([delegate conformsToProtocol:@protocol(MVMCoreActionDelegateProtocol)] ? (NSObject <MVMCoreActionDelegateProtocol>*)delegate : nil) additionalData:additionalData buttonDelegate:([delegate conformsToProtocol:@protocol(ButtonDelegateProtocol)] ? (id <ButtonDelegateProtocol>)delegate : nil)];
+    [self setWithActionMap:json delegateObject:delegateObject additionalData:additionalData];
     if ([self titleForState:UIControlStateNormal].length == 0) {
         self.heightConstraint.constant = 0;
     } else {

MVMCoreUI/Atoms/Buttons/PrimaryButton.m

@@ -648,9 +648,10 @@
     [self setAsStandardCustom];
 }
 
-- (void)setWithJSON:(NSDictionary *)json delegate:(NSObject *)delegate additionalData:(nullable NSDictionary *)additionalData {
+- (void)setWithJSON:(NSDictionary *)json delegateObject:(DelegateObject *)delegateObject additionalData:(NSDictionary *)additionalData {
-        
+    if ([delegateObject isKindOfClass:[MVMCoreUIDelegateObject class]]) {
-    [FormValidator setupValidationWithMolecule:self delegate:(id<FormValidationProtocol>)delegate];
+        [FormValidator setupValidationWithMolecule:self delegate:((MVMCoreUIDelegateObject *)delegateObject).formValidationProtocol];
+    }
 
     self.primaryButtonType = PrimaryButtonTypeCustom;
     NSString *color = [json string:@"fillColor"];
@@ -676,7 +677,7 @@
     self.validationRequired = [json boolForKey:@"validationRequired"];
     
     [self setAsSmallButton:[json boolForKey:@"small"]];
-    [self setWithActionMap:json actionDelegate:([delegate conformsToProtocol:@protocol(MVMCoreActionDelegateProtocol)] ? (NSObject <MVMCoreActionDelegateProtocol>*)delegate : nil) additionalData:additionalData buttonDelegate:([delegate conformsToProtocol:@protocol(ButtonDelegateProtocol)] ? (id <ButtonDelegateProtocol>)delegate : nil)];
+    [self setWithActionMap:json delegateObject:delegateObject additionalData:additionalData];
 }
 
 #pragma mark - Handling Validations

MVMCoreUI/Atoms/Views/MFLabel.h

@@ -9,6 +9,7 @@
 #import <UIKit/UIKit.h>
 #import <MVMCoreUI/MFView.h>
 @class MFSizeObject;
+@class DelegateObject;
 
 @interface MFLabel : UILabel <MVMCoreViewProtocol, MVMCoreUIMoleculeViewProtocol>
 
@@ -49,7 +50,7 @@
 
 // Setters
 + (void)setLabel:(nullable UILabel *)label withHTML:(nullable NSString *)html;
-+ (void)setUILabel:(nullable UILabel *)label withJSON:(nullable NSDictionary *)json delegate:(nullable NSObject *)delegate additionalData:(nullable NSDictionary *)additionalData;
++ (void)setUILabel:(nullable UILabel *)label withJSON:(nullable NSDictionary *)json delegateObject:(nullable DelegateObject *)delegateObject additionalData:(nullable NSDictionary *)additionalData;
 
 - (void)styleH1:(BOOL)scale;
 - (void)styleH2:(BOOL)scale;

MVMCoreUI/BaseControllers/MFViewController.m

@@ -138,7 +138,7 @@
     
     // Creates an initial load object if needed.
     if (!self.loadObject) {
-        self.loadObject = [[MVMCoreLoadObject alloc] initWithDelegate:self];
+        self.loadObject = [[MVMCoreLoadObject alloc] initWithDelegateObject:[self delegateObject]];
     }
     
     // Avoid the setter so we are only setting the bool and wait for view will appear to update the navigation bar.
@@ -343,7 +343,7 @@
     if (rightPanelLinkDict) {
         [[MVMCoreActionHandler sharedActionHandler] handleActionWithDictionary:rightPanelLinkDict
                                                                 additionalData:nil
-                                                                      delegate:self];
+                                                                      delegateObject:[self delegateObject]];
         return YES;
     } else {
         return NO;
@@ -607,7 +607,7 @@
     [self.formValidator addFormParamsWithRequestParameters:requestParameters];
     requestParameters.parentPageType = [self.loadObject.pageJSON stringForKey:@"parentPageType"];
     
-    [[MVMCoreLoadHandler sharedGlobal] loadRequest:requestParameters dataForPage:additionalData delegate:self];
+    [[MVMCoreLoadHandler sharedGlobal] loadRequest:requestParameters dataForPage:additionalData delegateObject:[self delegateObject]];
 }
 
 - (void)handleBackAction:(nullable NSDictionary *)actionInformation additionalData:(nullable NSDictionary *)additionalData {
@@ -662,7 +662,7 @@
 
 - (void)handleUnknownActionType:(nullable NSString *)actionType actionInformation:(nullable NSDictionary *)actionInformation additionalData:(nullable NSDictionary *)additionalData {
     
-    [MVMCoreActionHandler defaultHandleUnknownActionType:actionType actionInformation:actionInformation additionalData:additionalData delegate:self];
+    [MVMCoreActionHandler defaultHandleUnknownActionType:actionType actionInformation:actionInformation additionalData:additionalData delegateObject:[self delegateObject]];
 }
 
 - (void)handleActionError:(nonnull MVMCoreErrorObject *)error additionalData:(nullable NSDictionary *)additionalData {
@@ -689,7 +689,7 @@
 }
 
 - (nullable MVMCoreAlertObject *)alertObjectToShow:(nonnull MVMCoreLoadObject *)loadObject error:(nullable MVMCoreErrorObject *)errorObject {
-    return [MVMCoreAlertObject alertObjectForLoadObject:loadObject error:errorObject actionDelegate:self];
+    return [MVMCoreAlertObject alertObjectForLoadObject:loadObject error:errorObject delegateObject:[self delegateObject]];
 }
 
 - (void)handleFieldErrors:(nullable NSArray *)fieldErrors loadObject:(nonnull MVMCoreLoadObject *)loadObject {

MVMCoreUI/Containers/TabBarController/MVMCoreUITabBarPageControlViewController.m

@@ -394,7 +394,7 @@
             if (customAdditionalData) {
                 [additionalData addEntriesFromDictionary:customAdditionalData];
             }
-            [[MVMCoreActionHandler sharedActionHandler] handleActionWithDictionary:actionMap additionalData:additionalData delegate:self];
+            [[MVMCoreActionHandler sharedActionHandler] handleActionWithDictionary:actionMap additionalData:additionalData delegateObject:[self delegateObject]];
         }
     }
     return NO;

MVMCoreUI/FormUIHelpers/FormValidator+FormParams.swift

@@ -9,11 +9,11 @@
 import Foundation
 
 @objc public extension FormValidator {
-    @objc public func addFormParams(requestParameters: MVMCoreRequestParameters)  {
+    @objc func addFormParams(requestParameters: MVMCoreRequestParameters)  {
         requestParameters.add(self.getFormParams())
     }
     
-    @objc public func getFormParams() -> [String: Any] {
+    @objc func getFormParams() -> [String: Any] {
         var extraParam: [String: Any] = [:]
         MVMCoreDispatchUtility.performSyncBlock(onMainThread: {
             for molecule in self.molecules {

MVMCoreUI/LegacyControllers/TopLabelsAndBottomButtonsTableViewController.m

@@ -117,7 +117,7 @@
 		// Sets up the buttons/button.
 		NSDictionary *primaryButtonDictionary = [self primaryButtonMap];
 		NSDictionary *secondaryButtonDictionary = [self secondaryButtonMap];
-        TwoButtonView *buttonView = [[TwoButtonView alloc] initWithPrimaryButtonMap:primaryButtonDictionary secondaryButtonMap:secondaryButtonDictionary actionDelegate:self additionalData:nil buttonDelegate:self];
+        TwoButtonView *buttonView = [[TwoButtonView alloc] initWithPrimaryButtonMap:primaryButtonDictionary secondaryButtonMap:secondaryButtonDictionary delegateObject:[self delegateObject] additionalData:nil];
         self.secondaryButton = buttonView.secondaryButton;
         self.primaryButton = buttonView.primaryButton;
 

MVMCoreUI/LegacyControllers/TopLabelsAndBottomButtonsViewController.m

@@ -127,7 +127,7 @@
         // Sets up the buttons/button.
         NSDictionary *primaryButtonDictionary = [self primaryButtonMap];
         NSDictionary *secondaryButtonDictionary = [self secondaryButtonMap];
-        TwoButtonView *buttonView = [[TwoButtonView alloc] initWithPrimaryButtonMap:primaryButtonDictionary secondaryButtonMap:secondaryButtonDictionary actionDelegate:self additionalData:nil buttonDelegate:self];
+        TwoButtonView *buttonView = [[TwoButtonView alloc] initWithPrimaryButtonMap:primaryButtonDictionary secondaryButtonMap:secondaryButtonDictionary delegateObject:[self delegateObject] additionalData:nil];
         self.secondaryButton = buttonView.secondaryButton;
         self.primaryButton = buttonView.primaryButton;
         bottomView = buttonView;

MVMCoreUI/Molecules/TwoButtonView.swift

@@ -150,6 +150,17 @@ import UIKit
     }
     
     // MARK: - Legacy
+    public convenience init(primaryButtonMap: [AnyHashable: Any]?, secondaryButtonMap: [AnyHashable: Any]?, delegateObject: DelegateObject?, additionalData: [AnyHashable: Any]?) {
+        self.init()
+        setup(primaryButtonMap: primaryButtonMap, secondaryButtonMap: secondaryButtonMap, delegateObject: delegateObject, additionalData: additionalData)
+    }
+    
+    public convenience init(buttonSmall small: Bool, buttonMap: [AnyHashable: Any]?, delegateObject: DelegateObject?, additionalData: [AnyHashable: AnyHashable]?) {
+        self.init()
+        setup(withButtonMap: buttonMap, delegateObject: delegateObject, additionalData: additionalData)
+        primaryButton?.setAsSmall(small)
+        secondaryButton?.setAsSmall(small)
+    }
     
     public convenience init(buttonSmall small: Bool, enabled: Bool) {
         self.init()
@@ -159,6 +170,26 @@ import UIKit
         primaryButton?.isEnabled = enabled
     }
     
+    open func setup(primaryButtonMap: [AnyHashable: Any]?, secondaryButtonMap: [AnyHashable: Any]?, delegateObject: DelegateObject?, additionalData: [AnyHashable: Any]?) {
+        setupUI(withPrimaryButtonMap: primaryButtonMap, secondaryButtonMap: secondaryButtonMap, legacy: true)
+        if primaryButtonMap != nil, secondaryButtonMap != nil {
+            primaryButton?.setWithActionMap(primaryButtonMap, delegateObject: delegateObject, additionalData: additionalData)
+            secondaryButton?.setWithActionMap(secondaryButtonMap, delegateObject: delegateObject, additionalData: additionalData)
+        } else if primaryButtonMap != nil {
+            primaryButton?.setWithActionMap(primaryButtonMap, delegateObject: delegateObject, additionalData: additionalData)
+            primaryButton?.bordered = false
+        } else if secondaryButtonMap != nil {
+            primaryButton?.setWithActionMap(secondaryButtonMap, delegateObject: delegateObject, additionalData: additionalData)
+            primaryButton?.bordered = true
+        }
+    }
+    
+    open func setup(withButtonMap buttonMap: [AnyHashable: Any]?, delegateObject: DelegateObject?, additionalData: [AnyHashable: Any]?) {
+        let secondaryButtonMap = buttonMap?.optionalDictionaryForKey(KeySecondaryButton)
+        let primaryButtonMap = buttonMap?.optionalDictionaryForKey(KeyPrimaryButton)
+        setup(primaryButtonMap: primaryButtonMap, secondaryButtonMap: secondaryButtonMap, delegateObject: delegateObject, additionalData: additionalData)
+    }
+    
     public func hidePrimaryLeftButton() {
         guard let secondaryButton = secondaryButton, !secondaryButton.isHidden else {
             return