From 9ce1e7ec93616dcec7a714b2c61a07f56c7df134 Mon Sep 17 00:00:00 2001 From: "Xinlei(Ryan) Pan" Date: Wed, 29 Jan 2020 11:27:24 -0500 Subject: [PATCH] add PrimaryButtonView back to prepay legacy view/ view controller --- .../HorizontalCombinationViews/PrimaryButtonView.h | 2 ++ .../HorizontalCombinationViews/PrimaryButtonView.m | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/MVMCoreUI/Molecules/HorizontalCombinationViews/PrimaryButtonView.h b/MVMCoreUI/Molecules/HorizontalCombinationViews/PrimaryButtonView.h index c0e8994d..9c290fcf 100644 --- a/MVMCoreUI/Molecules/HorizontalCombinationViews/PrimaryButtonView.h +++ b/MVMCoreUI/Molecules/HorizontalCombinationViews/PrimaryButtonView.h @@ -54,6 +54,8 @@ // update with delegateObject - (nonnull instancetype)initButtonSmall:(BOOL)small buttonMap:(nullable NSDictionary *)buttonMap delegateObject:(nullable DelegateObject *)delegateObject additionalData:(nullable NSDictionary *)additionalData; +- (nonnull instancetype)initWithPrimaryButtonMap:(nullable NSDictionary *)primaryButtonMap secondaryButtonMap:(nullable NSDictionary *)secondaryButtonMap delegateObject:(nullable DelegateObject *)delegateObject additionalData:(nullable NSDictionary *)additionalData; + - (void)setupWithButtonMap:(nullable NSDictionary *)buttonMap delegateObject:(nullable DelegateObject *)delegateObject additionalData:(nullable NSDictionary *)additionalData; - (void)setupWithPrimaryButtonMap:(nullable NSDictionary *)primaryButtonMap secondaryButtonMap:(nullable NSDictionary *)secondaryButtonMap delegateObject:(nullable DelegateObject *)delegateObject additionalData:(nullable NSDictionary *)additionalData; diff --git a/MVMCoreUI/Molecules/HorizontalCombinationViews/PrimaryButtonView.m b/MVMCoreUI/Molecules/HorizontalCombinationViews/PrimaryButtonView.m index 738810af..07fd0ff4 100644 --- a/MVMCoreUI/Molecules/HorizontalCombinationViews/PrimaryButtonView.m +++ b/MVMCoreUI/Molecules/HorizontalCombinationViews/PrimaryButtonView.m @@ -361,6 +361,15 @@ return [self initButtonSmall:small buttonMap:buttonMap actionDelegate:actionDelegate additionalData:additionalData buttonDelegate:buttonDelegate]; } +- (nonnull instancetype)initWithPrimaryButtonMap:(nullable NSDictionary *)primaryButtonMap secondaryButtonMap:(nullable NSDictionary *)secondaryButtonMap delegateObject:(nullable DelegateObject *)delegateObject additionalData:(nullable NSDictionary *)additionalData { + NSObject *buttonDelegate; + NSObject *actionDelegate = delegateObject.actionDelegate; + if ([delegateObject isKindOfClass:[MVMCoreUIDelegateObject class]]) { + buttonDelegate = ((MVMCoreUIDelegateObject *)delegateObject).buttonDelegate; + } + return [self initWithPrimaryButtonMap:primaryButtonMap secondaryButtonMap:secondaryButtonMap actionDelegate:actionDelegate additionalData:additionalData buttonDelegate:buttonDelegate]; +} + - (void)setupWithButtonMap:(nullable NSDictionary *)buttonMap delegate:(nullable DelegateObject *)delegateObject additionalData:(nullable NSDictionary *)additionalData { NSObject *buttonDelegate; NSObject *actionDelegate = delegateObject.actionDelegate;