From e7e829bb44daa0a1f6aaa295540ff63cb0a0b64d Mon Sep 17 00:00:00 2001 From: Scott Pfeil Date: Fri, 2 Sep 2022 15:49:06 -0400 Subject: [PATCH 1/4] remove deprecated MVMCoreLoadObject code --- .../MVMCore/LoadHandling/MVMCoreLoadObject.h | 9 ----- .../MVMCore/LoadHandling/MVMCoreLoadObject.m | 40 ------------------- 2 files changed, 49 deletions(-) diff --git a/MVMCore/MVMCore/LoadHandling/MVMCoreLoadObject.h b/MVMCore/MVMCore/LoadHandling/MVMCoreLoadObject.h index 92063b8..1ee321d 100644 --- a/MVMCore/MVMCore/LoadHandling/MVMCoreLoadObject.h +++ b/MVMCore/MVMCore/LoadHandling/MVMCoreLoadObject.h @@ -46,7 +46,6 @@ @property (nullable, strong, nonatomic) NSDictionary *dataForPage; // The load delegate -@property (nullable, weak, nonatomic) NSObject *delegate __deprecated; @property (nullable, strong, nonatomic) DelegateObject *delegateObject; // The operation that is loading. @@ -70,12 +69,4 @@ // Returns whether the load will extend the app session timer based on the response provided by the server. - (BOOL)extendsAppSession; -#pragma mark - Deprecated - -- (nullable instancetype)initWithPageJSON:(nullable NSDictionary *)pageJSON modulesJSON:(nullable NSDictionary *)modulesJSON requestParameters:(nullable MVMCoreRequestParameters *)requestParameters dataForPage:(nullable NSDictionary *)dataForPage delegate:(nullable NSObject*)delegate __deprecated; - -- (nullable instancetype)initWithRequestParameters:(nullable MVMCoreRequestParameters *)requestParameters dataForPage:(nullable NSDictionary *)dataForPage delegate:(nullable NSObject*)delegate __deprecated; - -- (nullable instancetype)initWithDelegate:(nullable NSObject*)delegate __deprecated; - @end diff --git a/MVMCore/MVMCore/LoadHandling/MVMCoreLoadObject.m b/MVMCore/MVMCore/LoadHandling/MVMCoreLoadObject.m index 9c56d99..25240c4 100644 --- a/MVMCore/MVMCore/LoadHandling/MVMCoreLoadObject.m +++ b/MVMCore/MVMCore/LoadHandling/MVMCoreLoadObject.m @@ -68,44 +68,4 @@ return NO; } -#pragma mark - Deprecated - -- (void)setDelegateObject:(DelegateObject *)delegateObject { - _delegateObject = delegateObject; - _delegate = delegateObject.loadDelegate; -} - -- (void)setDelegate:(NSObject *)delegate { - _delegate = delegate; - if ([delegate respondsToSelector:@selector(delegateObject)]) { - _delegateObject = [delegate performSelector:@selector(delegateObject)]; - } else { - _delegateObject = [DelegateObject createWithDelegateForAll:delegate]; - } -} - -- (nullable instancetype)initWithPageJSON:(nullable NSDictionary *)pageJSON modulesJSON:(nullable NSDictionary *)modulesJSON requestParameters:(nullable MVMCoreRequestParameters *)requestParameters dataForPage:(nullable NSDictionary *)dataForPage delegate:(nullable NSObject*)delegate { - - if (self = [self initWithRequestParameters:requestParameters dataForPage:dataForPage delegate:delegate]) { - self.pageJSON = pageJSON; - self.modulesJSON = modulesJSON; - } - return self; -} - -- (nullable instancetype)initWithRequestParameters:(nullable MVMCoreRequestParameters *)requestParameters dataForPage:(nullable NSDictionary *)dataForPage delegate:(nullable NSObject*)delegate { - if (self = [self initWithDelegate:delegate]) { - self.requestParameters = requestParameters; - self.dataForPage = dataForPage; - } - return self; -} - -- (nullable instancetype)initWithDelegate:(nullable NSObject*)delegate { - if (self = [super init]) { - self.delegate = delegate; - } - return self; -} - @end From aff3d52fe8ccf6c4b9087b8efb18cfe9f1a2858f Mon Sep 17 00:00:00 2001 From: Sumanth Nadigadda Date: Tue, 6 Sep 2022 19:55:16 +0530 Subject: [PATCH 2/4] Adding actiontype attribute to encode in OpenPage action class --- MVMCore/MVMCore/ActionHandling/ActionOpenPageModel.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/MVMCore/MVMCore/ActionHandling/ActionOpenPageModel.swift b/MVMCore/MVMCore/ActionHandling/ActionOpenPageModel.swift index 611b7b7..34308ef 100644 --- a/MVMCore/MVMCore/ActionHandling/ActionOpenPageModel.swift +++ b/MVMCore/MVMCore/ActionHandling/ActionOpenPageModel.swift @@ -98,6 +98,7 @@ public struct ActionOpenPageModel: ActionModelProtocol, ActionOpenPageProtocol, public func encode(to encoder: Encoder) throws { var container = encoder.container(keyedBy: CodingKeys.self) try container.encode(pageType, forKey: .pageType) + try container.encode(actionType, forKey: .actionType) try container.encodeIfPresent(baseURL, forKey: .baseURL) try container.encodeIfPresent(appContext, forKey: .appContext) try container.encodeIfPresent(requestURL, forKey: .requestURL) From 13e03375d4664c3743416e7aa770f19361cd26fe Mon Sep 17 00:00:00 2001 From: svc-mips_ios_tower Date: Thu, 8 Sep 2022 10:49:48 -0400 Subject: [PATCH 3/4] Remove bitcode --- MVMCore/MVMCore.xcodeproj/project.pbxproj | 2 -- 1 file changed, 2 deletions(-) diff --git a/MVMCore/MVMCore.xcodeproj/project.pbxproj b/MVMCore/MVMCore.xcodeproj/project.pbxproj index bdd9165..66f3849 100644 --- a/MVMCore/MVMCore.xcodeproj/project.pbxproj +++ b/MVMCore/MVMCore.xcodeproj/project.pbxproj @@ -1131,7 +1131,6 @@ 8876D5D21FB50A9E00EB2E3D /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - BITCODE_GENERATION_MODE = bitcode; CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; @@ -1159,7 +1158,6 @@ 8876D5D31FB50A9E00EB2E3D /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - BITCODE_GENERATION_MODE = bitcode; CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; From 61ce51cefdff2c2baa2058708dfb34c717737590 Mon Sep 17 00:00:00 2001 From: Krishna Kishore Bandaru Date: Tue, 13 Sep 2022 21:28:50 +0530 Subject: [PATCH 4/4] setting animatingIn to false --- .../LoadHandling/LoadingOverlay/MVMCoreLoadingOverlayHandler.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MVMCore/MVMCore/LoadHandling/LoadingOverlay/MVMCoreLoadingOverlayHandler.m b/MVMCore/MVMCore/LoadHandling/LoadingOverlay/MVMCoreLoadingOverlayHandler.m index d8724af..f3c953e 100644 --- a/MVMCore/MVMCore/LoadHandling/LoadingOverlay/MVMCoreLoadingOverlayHandler.m +++ b/MVMCore/MVMCore/LoadHandling/LoadingOverlay/MVMCoreLoadingOverlayHandler.m @@ -139,7 +139,7 @@ if (animate) { self.animatingOut = YES; - + self.animatingIn = NO; [UIView animateWithDuration:0.3 delay:0 options:UIViewAnimationOptionBeginFromCurrentState animations:^{ self.loadingViewController.view.alpha = 0; } completion:^(BOOL finished) {