diff --git a/MVMCore/MVMCore.xcodeproj/project.pbxproj b/MVMCore/MVMCore.xcodeproj/project.pbxproj index ca804ec..a90b168 100644 --- a/MVMCore/MVMCore.xcodeproj/project.pbxproj +++ b/MVMCore/MVMCore.xcodeproj/project.pbxproj @@ -31,7 +31,6 @@ 01F2A04E23A82CF500D954D8 /* ActionPopupModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01F2A04D23A82CF500D954D8 /* ActionPopupModel.swift */; }; 01F2A05023A82D0800D954D8 /* ActionTopAlertModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01F2A04F23A82D0800D954D8 /* ActionTopAlertModel.swift */; }; 01F2A05223A8325100D954D8 /* ModelMapping.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01F2A05123A8325100D954D8 /* ModelMapping.swift */; }; - 01F2A05423A83E9200D954D8 /* KeyedDecodingContainer+CodingKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01F2A05323A83E9200D954D8 /* KeyedDecodingContainer+CodingKey.swift */; }; 30349BF11FCCA78A00546A1E /* MVMCoreSessionTimeHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 30349BEF1FCCA78A00546A1E /* MVMCoreSessionTimeHandler.h */; settings = {ATTRIBUTES = (Public, ); }; }; 30349BF21FCCA78A00546A1E /* MVMCoreSessionTimeHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 30349BF01FCCA78A00546A1E /* MVMCoreSessionTimeHandler.m */; }; 881D26931FCC9D180079C521 /* MVMCoreErrorObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 881D268F1FCC9D180079C521 /* MVMCoreErrorObject.m */; }; @@ -176,7 +175,6 @@ 01F2A04D23A82CF500D954D8 /* ActionPopupModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActionPopupModel.swift; sourceTree = ""; }; 01F2A04F23A82D0800D954D8 /* ActionTopAlertModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActionTopAlertModel.swift; sourceTree = ""; }; 01F2A05123A8325100D954D8 /* ModelMapping.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModelMapping.swift; sourceTree = ""; }; - 01F2A05323A83E9200D954D8 /* KeyedDecodingContainer+CodingKey.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "KeyedDecodingContainer+CodingKey.swift"; sourceTree = ""; }; 0A11030B20864F94008ADD90 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Localizable.strings; sourceTree = ""; }; 0A11030C20864F9A008ADD90 /* es-MX */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-MX"; path = "es-MX.lproj/Localizable.strings"; sourceTree = ""; }; 30349BEF1FCCA78A00546A1E /* MVMCoreSessionTimeHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MVMCoreSessionTimeHandler.h; sourceTree = ""; }; @@ -431,7 +429,6 @@ children = ( 946EE1AA237B5C940036751F /* Decoder.swift */, 946EE1B3237B619D0036751F /* Encoder.swift */, - 01F2A05323A83E9200D954D8 /* KeyedDecodingContainer+CodingKey.swift */, ); path = Extensions; sourceTree = ""; @@ -922,7 +919,6 @@ 01F2A05223A8325100D954D8 /* ModelMapping.swift in Sources */, AFBB969E1FBA3A9A0008D868 /* MVMCoreAlertObject.m in Sources */, 8876D5F51FB50AB000EB2E3D /* UILabel+MFCustom.m in Sources */, - 01F2A05423A83E9200D954D8 /* KeyedDecodingContainer+CodingKey.swift in Sources */, AFBB96B31FBA3B590008D868 /* MVMCoreGetterUtility.m in Sources */, AF43A7071FC4D7A2008E9347 /* MVMCoreObject.m in Sources */, D2DEDCB723C63F3B00C44CC4 /* Clamping.swift in Sources */, diff --git a/MVMCore/MVMCore/Models/ActionType/ActionBackModel.swift b/MVMCore/MVMCore/Models/ActionType/ActionBackModel.swift index 0080e38..7c903ff 100644 --- a/MVMCore/MVMCore/Models/ActionType/ActionBackModel.swift +++ b/MVMCore/MVMCore/Models/ActionType/ActionBackModel.swift @@ -13,4 +13,6 @@ import Foundation public var actionType: String? public var extraParameters: JSONValueDictionary? public var analyticsData: JSONValueDictionary? + // Temporary fix till server changes + public var title: String? } diff --git a/MVMCore/MVMCore/Models/ActionType/ActionCallModel.swift b/MVMCore/MVMCore/Models/ActionType/ActionCallModel.swift index 71f99ad..a579e63 100644 --- a/MVMCore/MVMCore/Models/ActionType/ActionCallModel.swift +++ b/MVMCore/MVMCore/Models/ActionType/ActionCallModel.swift @@ -14,6 +14,9 @@ import Foundation public var callNumber: String public var extraParameters: JSONValueDictionary? public var analyticsData: JSONValueDictionary? + // Temporary fix till server changes + public var title: String? + public init(callNumber: String) { self.callNumber = callNumber } diff --git a/MVMCore/MVMCore/Models/ActionType/ActionModelProtocol.swift b/MVMCore/MVMCore/Models/ActionType/ActionModelProtocol.swift index a610bfd..5a01d35 100644 --- a/MVMCore/MVMCore/Models/ActionType/ActionModelProtocol.swift +++ b/MVMCore/MVMCore/Models/ActionType/ActionModelProtocol.swift @@ -16,4 +16,7 @@ public protocol ActionModelProtocol: Model { var actionType: String? { get set } var extraParameters: JSONValueDictionary? { get set } var analyticsData: JSONValueDictionary? { get set } + + // Temporary fix till server changes + var title: String? { get set } } diff --git a/MVMCore/MVMCore/Models/ActionType/ActionOpenAppModel.swift b/MVMCore/MVMCore/Models/ActionType/ActionOpenAppModel.swift index 832d490..8cc9c58 100644 --- a/MVMCore/MVMCore/Models/ActionType/ActionOpenAppModel.swift +++ b/MVMCore/MVMCore/Models/ActionType/ActionOpenAppModel.swift @@ -14,6 +14,9 @@ import Foundation public var appURL: String public var extraParameters: JSONValueDictionary? public var analyticsData: JSONValueDictionary? + // Temporary fix till server changes + public var title: String? + public init(appURL: String) { self.appURL = appURL } diff --git a/MVMCore/MVMCore/Models/ActionType/ActionOpenPageModel.swift b/MVMCore/MVMCore/Models/ActionType/ActionOpenPageModel.swift index 9e6c986..63c679f 100644 --- a/MVMCore/MVMCore/Models/ActionType/ActionOpenPageModel.swift +++ b/MVMCore/MVMCore/Models/ActionType/ActionOpenPageModel.swift @@ -14,6 +14,9 @@ import Foundation public var pageType: String public var extraParameters: JSONValueDictionary? public var analyticsData: JSONValueDictionary? + // Temporary fix till server changes + public var title: String? + public init(pageType: String) { self.pageType = pageType } diff --git a/MVMCore/MVMCore/Models/ActionType/ActionOpenUrlModel.swift b/MVMCore/MVMCore/Models/ActionType/ActionOpenUrlModel.swift index 299e42a..1316d6a 100644 --- a/MVMCore/MVMCore/Models/ActionType/ActionOpenUrlModel.swift +++ b/MVMCore/MVMCore/Models/ActionType/ActionOpenUrlModel.swift @@ -14,6 +14,9 @@ import Foundation public var browserUrl: String public var extraParameters: JSONValueDictionary? public var analyticsData: JSONValueDictionary? + // Temporary fix till server changes + public var title: String? + public init(browserUrl: String) { self.browserUrl = browserUrl } diff --git a/MVMCore/MVMCore/Models/ActionType/ActionPopupModel.swift b/MVMCore/MVMCore/Models/ActionType/ActionPopupModel.swift index 2e33337..899f782 100644 --- a/MVMCore/MVMCore/Models/ActionType/ActionPopupModel.swift +++ b/MVMCore/MVMCore/Models/ActionType/ActionPopupModel.swift @@ -11,6 +11,7 @@ import Foundation @objcMembers public class ActionPopupModel: ActionModelProtocol { public static var identifier: String = "popup" public var actionType: String? + public var title: String? public var pageType: String public var extraParameters: JSONValueDictionary? public var analyticsData: JSONValueDictionary? diff --git a/MVMCore/MVMCore/Models/ActionType/ActionTopAlertModel.swift b/MVMCore/MVMCore/Models/ActionType/ActionTopAlertModel.swift index 89b7015..6da6491 100644 --- a/MVMCore/MVMCore/Models/ActionType/ActionTopAlertModel.swift +++ b/MVMCore/MVMCore/Models/ActionType/ActionTopAlertModel.swift @@ -14,6 +14,9 @@ import Foundation public var pageType: String public var extraParameters: JSONValueDictionary? public var analyticsData: JSONValueDictionary? + // Temporary fix till server changes + public var title: String? + public init(pageType: String) { self.pageType = pageType } diff --git a/MVMCore/MVMCore/Models/Extensions/KeyedDecodingContainer+CodingKey.swift b/MVMCore/MVMCore/Models/Extensions/KeyedDecodingContainer+CodingKey.swift deleted file mode 100644 index 25917a5..0000000 --- a/MVMCore/MVMCore/Models/Extensions/KeyedDecodingContainer+CodingKey.swift +++ /dev/null @@ -1,34 +0,0 @@ -// -// KeyedDecodingContainer+Action.swift -// MVMCore -// -// Created by Suresh, Kamlesh on 12/16/19. -// Copyright © 2019 myverizon. All rights reserved. -// - -import Foundation - -extension KeyedDecodingContainer where Key : CodingKey { -// private enum TypeCodingKey: String, CodingKey { -// case type -// } - -// public func decode(codingKey: KeyedDecodingContainer.Key) throws -> ActionModelProtocol { -// return try decode(codingKey: codingKey, typeCodingKey: TypeCodingKey.type) -// } -// -// public func decodeActionIfPresent(codingKey: KeyedDecodingContainer.Key) throws -> ActionModelProtocol? { -// return try decodeIfPresent(codingKey: codingKey, typeCodingKey: TypeCodingKey.type) -// } -// -// public func decodeActionArray(codingKey: KeyedDecodingContainer.Key) throws -> [ActionModelProtocol] { -// guard let models = try decodeArray(codingKey: codingKey, typeCodingKey: TypeCodingKey.type) as? [ActionModelProtocol] else { -// throw ModelRegistry.Error.decoderError -// } -// return models -// } -// -// public func decodeActionArrayIfPresent(codingKey: KeyedDecodingContainer.Key) throws -> [ActionModelProtocol]? { -// return try decodeArrayIfPresent(codingKey: codingKey, typeCodingKey: TypeCodingKey.type) as? [ActionModelProtocol] -// } -}