mbrucedogs/mvm_core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into feature/new_relic_action_tracking

Browse Source
This commit is contained in:
Kyle Matthew Hedden 2022-09-19 13:03:29 -04:00
commit 3abf053e4e
5 changed files with 2 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MVMCore/MVMCore.xcodeproj/project.pbxproj
View File

@ -1139,7 +1139,6 @@
8876D5D21FB50A9E00EB2E3D /* Debug */ = { 8876D5D21FB50A9E00EB2E3D /* Debug */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
BITCODE_GENERATION_MODE = bitcode;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = ""; CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
@ -1167,7 +1166,6 @@
8876D5D31FB50A9E00EB2E3D /* Release */ = { 8876D5D31FB50A9E00EB2E3D /* Release */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
BITCODE_GENERATION_MODE = bitcode;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = ""; CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;

1
MVMCore/MVMCore/ActionHandling/ActionOpenPageModel.swift
View File

@ -98,6 +98,7 @@ public struct ActionOpenPageModel: ActionModelProtocol, ActionOpenPageProtocol,
public func encode(to encoder: Encoder) throws { public func encode(to encoder: Encoder) throws {
var container = encoder.container(keyedBy: CodingKeys.self) var container = encoder.container(keyedBy: CodingKeys.self)
try container.encode(pageType, forKey: .pageType) try container.encode(pageType, forKey: .pageType)
try container.encode(actionType, forKey: .actionType)
try container.encodeIfPresent(baseURL, forKey: .baseURL) try container.encodeIfPresent(baseURL, forKey: .baseURL)
try container.encodeIfPresent(appContext, forKey: .appContext) try container.encodeIfPresent(appContext, forKey: .appContext)
try container.encodeIfPresent(requestURL, forKey: .requestURL) try container.encodeIfPresent(requestURL, forKey: .requestURL)

2
MVMCore/MVMCore/LoadHandling/LoadingOverlay/MVMCoreLoadingOverlayHandler.m
View File

@ -139,7 +139,7 @@
if (animate) { if (animate) {
self.animatingOut = YES; self.animatingOut = YES;
self.animatingIn = NO;
[UIView animateWithDuration:0.3 delay:0 options:UIViewAnimationOptionBeginFromCurrentState animations:^{ [UIView animateWithDuration:0.3 delay:0 options:UIViewAnimationOptionBeginFromCurrentState animations:^{
self.loadingViewController.view.alpha = 0; self.loadingViewController.view.alpha = 0;
} completion:^(BOOL finished) { } completion:^(BOOL finished) {

9
MVMCore/MVMCore/LoadHandling/MVMCoreLoadObject.h
View File

@ -46,7 +46,6 @@
@property (nullable, strong, nonatomic) NSDictionary *dataForPage; @property (nullable, strong, nonatomic) NSDictionary *dataForPage;
// The load delegate // The load delegate
@property (nullable, weak, nonatomic) NSObject <MVMCoreLoadDelegateProtocol,MVMCorePresentationDelegateProtocol,MVMCoreActionDelegateProtocol> *delegate __deprecated;
@property (nullable, strong, nonatomic) DelegateObject *delegateObject; @property (nullable, strong, nonatomic) DelegateObject *delegateObject;
// The operation that is loading. // 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. // Returns whether the load will extend the app session timer based on the response provided by the server.
- (BOOL)extendsAppSession; - (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<MVMCoreLoadDelegateProtocol,MVMCorePresentationDelegateProtocol,MVMCoreActionDelegateProtocol>*)delegate __deprecated;
- (nullable instancetype)initWithRequestParameters:(nullable MVMCoreRequestParameters *)requestParameters dataForPage:(nullable NSDictionary *)dataForPage delegate:(nullable NSObject<MVMCoreLoadDelegateProtocol,MVMCorePresentationDelegateProtocol,MVMCoreActionDelegateProtocol>*)delegate __deprecated;
- (nullable instancetype)initWithDelegate:(nullable NSObject<MVMCoreLoadDelegateProtocol,MVMCorePresentationDelegateProtocol,MVMCoreActionDelegateProtocol>*)delegate __deprecated;
@end @end

40
MVMCore/MVMCore/LoadHandling/MVMCoreLoadObject.m
View File

@ -68,44 +68,4 @@
return NO; return NO;
} }
#pragma mark - Deprecated
- (void)setDelegateObject:(DelegateObject *)delegateObject {
_delegateObject = delegateObject;
_delegate = delegateObject.loadDelegate;
}
- (void)setDelegate:(NSObject<MVMCoreLoadDelegateProtocol,MVMCorePresentationDelegateProtocol,MVMCoreActionDelegateProtocol> *)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<MVMCoreLoadDelegateProtocol,MVMCorePresentationDelegateProtocol,MVMCoreActionDelegateProtocol>*)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<MVMCoreLoadDelegateProtocol,MVMCorePresentationDelegateProtocol,MVMCoreActionDelegateProtocol>*)delegate {
if (self = [self initWithDelegate:delegate]) {
self.requestParameters = requestParameters;
self.dataForPage = dataForPage;
}
return self;
}
- (nullable instancetype)initWithDelegate:(nullable NSObject<MVMCoreLoadDelegateProtocol,MVMCorePresentationDelegateProtocol,MVMCoreActionDelegateProtocol>*)delegate {
if (self = [super init]) {
self.delegate = delegate;
}
return self;
}
@end @end